Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

4 files changed, 6 insertions, 40 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index c814f9cb0cb..ff7dde0bf98 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -360,17 +360,8 @@ Client::run(int argc, char* argv[])
                 cerr << argv[0] << ": could not contact the default router:" << endl << ex << endl;
                 return EXIT_FAILURE;                
             }
-
-            // Use SSL if available.
-            try
-            {
-                Glacier2::RouterPrx secureRouter = router->ice_secure(true);
-                secureRouter->ice_ping();
-                router = secureRouter;
-            }
-            catch(const Ice::NoEndpointException&)
-            {
-            }
+            
+            router = router->ice_preferSecure(true); // Use SSL if available.
 
             if(ssl)
             {
@@ -483,16 +474,7 @@ Client::run(int argc, char* argv[])
                 }
             }
 
-            // Use SSL if available.
-            try
-            {
-                RegistryPrx secureRegistry = registry->ice_secure(true);
-                secureRegistry->ice_ping();
-                registry = secureRegistry;
-            }
-            catch(const Ice::NoEndpointException&)
-            {
-            }
+            registry = registry->ice_preferSecure(true); // Use SSL if available.
 
             if(ssl)
             {
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 27ae39bb7ff..365ef7bb65c 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -155,12 +155,6 @@ PropertySetDescriptorBuilder::PropertySetDescriptorBuilder() :
 {
 }
 
-PropertySetDescriptorBuilder::PropertySetDescriptorBuilder(const PropertySetDescriptor& desc) :
-    _descriptor(desc),
-    _inPropertySetRef(false)
-{
-}
-
 void
 PropertySetDescriptorBuilder::setId(const string& id)
 {
@@ -639,7 +633,7 @@ CommunicatorDescriptorBuilder::addProperty(const XmlAttributesHelper& attrs)
 PropertySetDescriptorBuilder*
 CommunicatorDescriptorBuilder::createPropertySet() const
 {
-    return new PropertySetDescriptorBuilder(_descriptor->propertySet);
+    return new PropertySetDescriptorBuilder();
 }
 
 void
@@ -804,7 +798,7 @@ ServiceInstanceDescriptorBuilder::ServiceInstanceDescriptorBuilder(const XmlAttr
 PropertySetDescriptorBuilder*
 ServiceInstanceDescriptorBuilder::createPropertySet() const
 {
-    return new PropertySetDescriptorBuilder(_descriptor.propertySet);
+    return new PropertySetDescriptorBuilder();
 }
 
 void
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index af2928d71e3..2eca482da30 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -60,7 +60,6 @@ class PropertySetDescriptorBuilder : DescriptorBuilder
 public:
     
     PropertySetDescriptorBuilder();
-    PropertySetDescriptorBuilder(const PropertySetDescriptor&);
     
     void setId(const std::string&);
     void setService(const std::string&);
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"))