zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesAdminI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,8 +28,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 

data/ext/ice/cpp/src/Ice/PropertiesI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertiesI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/PropertyNames.cpp

@@ -1,12 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Dec  9 12:08:30 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Apr 28 22:03:41 2015
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -186,6 +186,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
     IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
     IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
+    IceInternal::Property("Ice.Voip", false, 0),
 };
 
 const IceInternal::PropertyArray
@@ -997,9 +998,11 @@ const IceInternal::PropertyArray
 const IceInternal::Property IceSSLPropsData[] = 
 {
     IceInternal::Property("IceSSL.Alias", false, 0),
-    IceInternal::Property("IceSSL.CertAuthDir", false, 0),
-    IceInternal::Property("IceSSL.CertAuthFile", false, 0),
+    IceInternal::Property("IceSSL.CAs", false, 0),
+    IceInternal::Property("IceSSL.CertAuthDir", true, "IceSSL.CAs"),
+    IceInternal::Property("IceSSL.CertAuthFile", true, "IceSSL.CAs"),
     IceInternal::Property("IceSSL.CertStore", false, 0),
+    IceInternal::Property("IceSSL.CertStoreLocation", false, 0),
     IceInternal::Property("IceSSL.CertFile", false, 0),
     IceInternal::Property("IceSSL.CertVerifier", false, 0),
     IceInternal::Property("IceSSL.CheckCertName", false, 0),
@@ -1010,11 +1013,11 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.DHParams", false, 0),
     IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
     IceInternal::Property("IceSSL.FindCert", false, 0),
-    IceInternal::Property("IceSSL.FindCert.*", false, 0),
+    IceInternal::Property("IceSSL.FindCert.*", true, "IceSSL.FindCert"),
     IceInternal::Property("IceSSL.ImportCert.*", true, 0),
     IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
-    IceInternal::Property("IceSSL.KeyFile", false, 0),
-    IceInternal::Property("IceSSL.KeySet", false, 0),
+    IceInternal::Property("IceSSL.KeyFile", true, 0),
+    IceInternal::Property("IceSSL.KeySet", true, "IceSSL.CertStoreLocation"),
     IceInternal::Property("IceSSL.Keychain", false, 0),
     IceInternal::Property("IceSSL.KeychainPassword", false, 0),
     IceInternal::Property("IceSSL.Keystore", false, 0),
@@ -1023,7 +1026,7 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.Password", false, 0),
     IceInternal::Property("IceSSL.PasswordCallback", false, 0),
     IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
-    IceInternal::Property("IceSSL.PersistKeySet", false, 0),
+    IceInternal::Property("IceSSL.PersistKeySet", true, 0),
     IceInternal::Property("IceSSL.Protocols", false, 0),
     IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0),
     IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0),
@@ -1036,6 +1039,7 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.Truststore", false, 0),
     IceInternal::Property("IceSSL.TruststorePassword", false, 0),
     IceInternal::Property("IceSSL.TruststoreType", false, 0),
+    IceInternal::Property("IceSSL.UsePlatformCAs", false, 0),
     IceInternal::Property("IceSSL.VerifyDepthMax", false, 0),
     IceInternal::Property("IceSSL.VerifyPeer", false, 0),
 };

data/ext/ice/cpp/src/Ice/PropertyNames.h

@@ -1,12 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Dec  9 12:08:30 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Apr 28 22:03:41 2015
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 

data/ext/ice/cpp/src/Ice/Protocol.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -15,7 +15,7 @@ namespace IceInternal
 
 const Ice::Byte magic[] = { 0x49, 0x63, 0x65, 0x50 };   // 'I', 'c', 'e', 'P'
 
-const Ice::Byte requestHdr[] = 
+const Ice::Byte requestHdr[] =
 {
     magic[0],
     magic[1],
@@ -47,7 +47,7 @@ const Ice::Byte requestBatchHdr[] =
     0, 0, 0, 0  // Number of requests in batch (placeholder)
 };
 
-const Ice::Byte replyHdr[] = 
+const Ice::Byte replyHdr[] =
 {
     magic[0],
     magic[1],
@@ -81,7 +81,7 @@ stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor)
         ex.str = "invalid major version value `" + str + "'";
         throw ex;
     }
-    
+
     std::istringstream minStr(str.substr(pos + 1, std::string::npos));
     Ice::Int minVersion;
     if(!(minStr >> minVersion) || !minStr.eof())
@@ -97,12 +97,12 @@ stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor)
         ex.str = "range error in version `" + str + "'";
         throw ex;
     }
-    
+
     major = static_cast<Ice::Byte>(majVersion);
     minor = static_cast<Ice::Byte>(minVersion);
 }
 
-void 
+void
 throwUnsupportedProtocolException(const char* f, int l, const Ice::ProtocolVersion& v, const Ice::ProtocolVersion& s)
 {
     throw Ice::UnsupportedProtocolException(f, l, "", v, s);
@@ -126,7 +126,7 @@ const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInterna
 // The encoding to use for protocol messages, this version is tied to
 // the protocol version.
 //
-const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor, 
+const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor,
                                                   IceInternal::protocolEncodingMinor };
 
 const ProtocolVersion Protocol_1_0 = { 1, 0 };

data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -20,23 +20,27 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProtocolInstance* p) { return p; }
 
-IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol) :
+IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol,
+                                                 bool secure) :
     _instance(getInstance(com)),
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
-    _type(type)
+    _type(type),
+    _secure(secure)
 {
 }
 
-IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Short type, const string& protocol) :
+IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Short type, const string& protocol,
+                                                bool secure) :
     _instance(instance),
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
-    _type(type)
+    _type(type),
+    _secure(secure)
 {
 }
 
@@ -76,7 +80,6 @@ IceInternal::ProtocolInstance::defaultTimeout() const
     return _instance->defaultsAndOverrides()->defaultTimeout;
 }
 
-
 NetworkProxyPtr
 IceInternal::ProtocolInstance::networkProxy() const
 {

data/ext/ice/cpp/src/Ice/ProtocolInstance.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -27,7 +27,7 @@ class ICE_API ProtocolInstance : public IceUtil::Shared
 {
 public:
 
-    ProtocolInstance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&);
+    ProtocolInstance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&, bool);
 
     int traceLevel() const
     {
@@ -59,6 +59,26 @@ public:
         return _properties;
     }
 
+    bool secure() const
+    {
+        return _secure;
+    }
+
+    BufSizeWarnInfo getBufSizeWarn(Ice::Short type)
+    {
+        return _instance->getBufSizeWarn(type);
+    }
+
+    void setSndBufSizeWarn(Ice::Short type, int size)
+    {
+        _instance->setSndBufSizeWarn(type, size);
+    }
+
+    void setRcvBufSizeWarn(Ice::Short type, int size)
+    {
+        _instance->setRcvBufSizeWarn(type, size);
+    }
+
     bool preferIPv6() const;
     ProtocolSupport protocolSupport() const;
     const std::string& defaultHost() const;
@@ -71,19 +91,17 @@ public:
     void resolve(const std::string&, int, Ice::EndpointSelectionType, const IPEndpointIPtr&,
                  const EndpointI_connectorsPtr&) const;
 
-private:
+protected:
 
-    ProtocolInstance(const InstancePtr&, Ice::Short, const std::string&);
+    ProtocolInstance(const InstancePtr&, Ice::Short, const std::string&, bool);
     friend class Instance;
     const InstancePtr _instance;
-
-protected:
-
     const int _traceLevel;
     const std::string _traceCategory;
     const Ice::PropertiesPtr _properties;
     const std::string _protocol;
     const Ice::Short _type;
+    const bool _secure;
 };
 
 }

data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/Proxy.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -14,7 +14,6 @@
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Outgoing.h>
 #include <Ice/OutgoingAsync.h>
-#include <Ice/RequestHandlerFactory.h>
 #include <Ice/Reference.h>
 #include <Ice/EndpointI.h>
 #include <Ice/Instance.h>
@@ -1359,7 +1358,7 @@ IceProxy::Ice::Object::ice_getConnection()
         }
         catch(const IceInternal::RetryException&)
         {
-            __setRequestHandler(handler, 0); // Clear request handler and retry.
+            __updateRequestHandler(handler, 0); // Clear request handler and retry.
         }
         catch(const Exception& ex)
         {
@@ -1430,7 +1429,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const
 void
 IceProxy::Ice::Object::ice_flushBatchRequests()
 {
-    FlushBatch og(this, ice_flushBatchRequests_name);
+    ProxyFlushBatch og(this, ice_flushBatchRequests_name);
     og.invoke();
 }
 
@@ -1438,7 +1437,7 @@ IceProxy::Ice::Object::ice_flushBatchRequests()
 IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
                                                             const ::Ice::LocalObjectPtr& cookie)
 {
-    ProxyFlushBatchPtr result = new ProxyFlushBatch(this, ice_flushBatchRequests_name, del, cookie);
+    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie);
     try
     {
         result->invoke();
@@ -1478,7 +1477,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
                                          bool sent,
                                          int& cnt)
 {
-    __setRequestHandler(handler, 0); // Clear the request handler
+    __updateRequestHandler(handler, 0); // Clear the request handler
 
     //
     // We only retry local exception, system exceptions aren't retried.
@@ -1624,19 +1623,39 @@ IceProxy::Ice::Object::__getRequestHandler()
         {
             return _requestHandler;
         }
-        handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this);
-        _requestHandler = handler;
     }
-    else
+    return _reference->getRequestHandler(this);
+}
+
+IceInternal::BatchRequestQueuePtr
+IceProxy::Ice::Object::__getBatchRequestQueue()
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(!_batchRequestQueue)
+    {
+        _batchRequestQueue = _reference->getBatchRequestQueue();
+    }
+    return _batchRequestQueue;
+}
+
+::IceInternal::RequestHandlerPtr
+IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
+{
+    if(_reference->getCacheConnection())
     {
-        handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this);
+        IceUtil::Mutex::Lock sync(_mutex);
+        if(!_requestHandler)
+        {
+            _requestHandler = handler;
+        }
+        return _requestHandler;
     }
-    return handler->connect(this);
+    return handler;
 }
 
 void
-IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
-                                           const ::IceInternal::RequestHandlerPtr& handler)
+IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
+                                              const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection() && previous)
     {