diff options
| author | Jose <jose@zeroc.com> | 2012-02-22 17:10:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-02-22 17:10:08 +0100 |
| commit | bc53f54490828fe2dcfda1133bd2f4c4f3ed97bd (patch) | |
| tree | 6ebb3678de6e37bf3d3629f1bb6712a45ff55421 /cpp/src | |
| parent | ICE-4798 - OSX DynamicLibrary fallback to .so/.bundle if .dylib fails (diff) | |
| download | ice-bc53f54490828fe2dcfda1133bd2f4c4f3ed97bd.tar.bz2 ice-bc53f54490828fe2dcfda1133bd2f4c4f3ed97bd.tar.xz ice-bc53f54490828fe2dcfda1133bd2f4c4f3ed97bd.zip | |
ICE-4747 - iceserviceinstall fails for SSL endpoint
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/iceserviceinstall/Install.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/iceserviceinstall/ServiceInstaller.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/iceserviceinstall/ServiceInstaller.h | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp index b2a0b812c38..6277a4d434c 100644 --- a/cpp/src/iceserviceinstall/Install.cpp +++ b/cpp/src/iceserviceinstall/Install.cpp @@ -48,7 +48,10 @@ wmain(int argc, wchar_t* argv[]) #endif { Install app; - int status = app.main(argc, argv); + InitializationData id; + id.properties = Ice::createProperties(); + id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL"); + int status = app.main(argc, argv, id); if(app.pauseEnabled() && (app.pause() || app.debug() || status != 0)) { diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp index 16b1e6a1537..0d7d285c423 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp +++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp @@ -67,8 +67,7 @@ IceServiceInstaller::IceServiceInstaller(int serviceType, const string& configFi // // Compute _serviceName // - _defaultLocator = LocatorPrx::uncheckedCast( - _communicator->stringToProxy(_serviceProperties->getProperty("Ice.Default.Locator"))); + if(_serviceType == icegridregistry) { @@ -77,9 +76,11 @@ IceServiceInstaller::IceServiceInstaller(int serviceType, const string& configFi } else { - if(_defaultLocator != 0) + Ice::LocatorPrx defaultLocator = LocatorPrx::uncheckedCast( + _communicator->stringToProxy(_serviceProperties->getProperty("Ice.Default.Locator"))); + if(defaultLocator != 0) { - _icegridInstanceName = _defaultLocator->ice_getIdentity().category; + _icegridInstanceName = defaultLocator->ice_getIdentity().category; } if(_serviceType == icegridnode) diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h index 35a4953cf4b..105e4aa3ff6 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.h +++ b/cpp/src/iceserviceinstall/ServiceInstaller.h @@ -66,7 +66,6 @@ private: Ice::PropertiesPtr _serviceProperties; std::string _serviceName; - Ice::LocatorPrx _defaultLocator; std::string _icegridInstanceName; std::string _nodeName; |