diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-02-16 12:36:36 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-02-16 12:36:36 +0100 |
| commit | 1d9509c347547b2d36d6fa3ff667927836d72245 (patch) | |
| tree | df6cc4ac9d1e2742ae8d9bf36a4f7927e7f970c1 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | Allow to create NuGet packages with single platform/configuration (diff) | |
| download | ice-1d9509c347547b2d36d6fa3ff667927836d72245.tar.bz2 ice-1d9509c347547b2d36d6fa3ff667927836d72245.tar.xz ice-1d9509c347547b2d36d6fa3ff667927836d72245.zip | |
Improved object adapter getPublishedEndpoints/refreshPublishedEndpoints method
to return the Ice router server endpoints if the adapter is associated with a
router.
setPublishedEndpoints now also raises an invalid argument exception for such
adapters.
Also fixed a rare deadlock that could occur on adapter creating if the router
wasn't accessible.
Fixes ICE-8675 and ICE-8650
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 08c2cee5658..3d4f9de3e63 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -120,7 +120,7 @@ private: ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const; void checkForDeactivation() const; std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const; - std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints(); + std::vector<IceInternal::EndpointIPtr> computePublishedEndpoints(); void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&); bool filterProperties(Ice::StringSeq&); @@ -147,7 +147,6 @@ private: const std::string _replicaGroupId; IceInternal::ReferencePtr _reference; std::vector<IceInternal::IncomingConnectionFactoryPtr> _incomingConnectionFactories; - std::vector<IceInternal::EndpointIPtr> _routerEndpoints; IceInternal::RouterInfoPtr _routerInfo; std::vector<IceInternal::EndpointIPtr> _publishedEndpoints; IceInternal::LocatorInfoPtr _locatorInfo; |