diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/IceGrid/RegistryI.h | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index d6999d9d000..75da1fa1259 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -77,22 +77,21 @@ public: Ice::ObjectPrx createAdminCallbackProxy(const Ice::Identity&) const; + const Ice::ObjectAdapterPtr& getRegistryAdapter() { return _registryAdapter; } + private: - Ice::LocatorRegistryPrx setupLocatorRegistry(const Ice::ObjectAdapterPtr&); - LocatorPrx setupLocator(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const Ice::LocatorRegistryPrx&, - const RegistryPrx&, const QueryPrx&); - QueryPrx setupQuery(const Ice::ObjectAdapterPtr&); - RegistryPrx setupRegistry(const Ice::ObjectAdapterPtr&); - InternalRegistryPrx setupInternalRegistry(const Ice::ObjectAdapterPtr&); - void setupNullPermissionsVerifier(const Ice::ObjectAdapterPtr&); - bool setupUserAccountMapper(const Ice::ObjectAdapterPtr&); - Ice::ObjectAdapterPtr setupClientSessionFactory(const Ice::ObjectAdapterPtr&, const LocatorPrx&); - Ice::ObjectAdapterPtr setupAdminSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectPtr&, - const LocatorPrx&); - - Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const Ice::ObjectAdapterPtr&, const LocatorPrx&, - const std::string&, const std::string&); + Ice::LocatorRegistryPrx setupLocatorRegistry(); + LocatorPrx setupLocator(const Ice::LocatorRegistryPrx&, const RegistryPrx&, const QueryPrx&); + QueryPrx setupQuery(); + RegistryPrx setupRegistry(); + InternalRegistryPrx setupInternalRegistry(); + void setupNullPermissionsVerifier(); + bool setupUserAccountMapper(); + Ice::ObjectAdapterPtr setupClientSessionFactory(const LocatorPrx&); + Ice::ObjectAdapterPtr setupAdminSessionFactory(const Ice::ObjectPtr&, const LocatorPrx&); + + Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const LocatorPrx&, const std::string&, const std::string&); Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const LocatorPrx&, const std::string&); Glacier2::SSLInfo getSSLInfo(const Ice::ConnectionPtr&, std::string&); @@ -109,6 +108,7 @@ private: DatabasePtr _database; Ice::ObjectAdapterPtr _clientAdapter; Ice::ObjectAdapterPtr _serverAdapter; + Ice::ObjectAdapterPtr _registryAdapter; WellKnownObjectsManagerPtr _wellKnownObjects; std::string _instanceName; bool _master; |