diff options
| author | Michi Henning <michi@zeroc.com> | 2007-10-16 16:04:22 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-10-16 16:04:22 +1000 |
| commit | 17bc57e6e22cffa7942d03c168afa278b0a4d7fd (patch) | |
| tree | ae9134b9e5b3c10d70b8f69f01fad365d32b9a94 /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Finished implementation of custom sequence mapping. (diff) | |
| parent | Fixed bug #2098 (diff) | |
| download | ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.tar.bz2 ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.tar.xz ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index c227ac955fb..ed26d1e022d 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -537,16 +537,7 @@ NodeService::start(int argc, char* argv[]) throw "invalid registry"; } - // - // Use SSL if available. - // - try - { - registry = RegistryPrx::checkedCast(registry->ice_secure(true)); - } - catch(const Ice::NoEndpointException&) - { - } + registry = registry->ice_preferSecure(true); // Use SSL if available. IceGrid::AdminSessionPrx session; if(communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL")) |