diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-16 15:26:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-16 15:26:34 +0200 |
| commit | 941a1104c970778cb28b7c58f93d30f6be97e2e5 (patch) | |
| tree | a29aa85867c3b2539e436e7e854725fbe49fd82a /cpp/src/Ice/Instance.cpp | |
| parent | Fixed ICE-5678: replaced call to GetEffectiveRightsFromAcl by call to AutzAcc... (diff) | |
| download | ice-941a1104c970778cb28b7c58f93d30f6be97e2e5.tar.bz2 ice-941a1104c970778cb28b7c58f93d30f6be97e2e5.tar.xz ice-941a1104c970778cb28b7c58f93d30f6be97e2e5.zip | |
Fixed ICE-5318: Review IceGrid timeout defaults
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 0247b858704..33ef5142a85 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -830,7 +830,6 @@ IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapte ObjectPrx admin = adminAdapter->createProxy(adminIdentity); LocatorPrx locator = adminAdapter->getLocator(); const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId"); - if(locator && serverId != "") { ProcessPrx process = ProcessPrx::uncheckedCast(admin->ice_facet("Process")); |