diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-04-09 17:08:17 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-04-09 17:08:17 +0200 |
| commit | abefabeae65261c96f34877ff286b406bfb09d73 (patch) | |
| tree | 83df2a93bd544e0a9ec2d935654177736c6f1e2e /cpp/src/IceGrid/RegistryI.h | |
| parent | amended README.txt to mention object by value (diff) | |
| download | ice-abefabeae65261c96f34877ff286b406bfb09d73.tar.bz2 ice-abefabeae65261c96f34877ff286b406bfb09d73.tar.xz ice-abefabeae65261c96f34877ff286b406bfb09d73.zip | |
Removed IceGrid AdminCallbackRouter object adapter (bug 2998)
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 516747d469e..7d82c5c6afb 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -86,7 +86,7 @@ private: Ice::ObjectAdapterPtr setupAdminSessionFactory(const Ice::ObjectAdapterPtr&, const Ice::ObjectPtr&, const LocatorPrx&); - void setupThreadPool(const Ice::PropertiesPtr&, const std::string&, int, int = 0); + void setupThreadPool(const Ice::PropertiesPtr&, const std::string&, int, int = 0, bool = false); Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const Ice::ObjectAdapterPtr&, const LocatorPrx&, const std::string&, const std::string&); @@ -103,7 +103,7 @@ private: DatabasePtr _database; Ice::ObjectAdapterPtr _clientAdapter; - Ice::ObjectAdapterPtr _adminCallbackRouterAdapter; + Ice::ObjectAdapterPtr _serverAdapter; WellKnownObjectsManagerPtr _wellKnownObjects; std::string _instanceName; bool _master; |