zeroc-ice 3.6.3 → 3.6.4

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -44,13 +44,13 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&) = 0;
     virtual void reap(const Ice::ConnectionIPtr&) = 0;
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&) = 0;
     virtual Ice::ACM getACM() = 0;
 };
 
-class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class FactoryACMMonitor : public ACMMonitor, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -61,8 +61,8 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&);
     virtual void reap(const Ice::ConnectionIPtr&);
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&);
     virtual Ice::ACM getACM();
 
@@ -96,8 +96,8 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&);
     virtual void reap(const Ice::ConnectionIPtr&);
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&);
     virtual Ice::ACM getACM();
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/Acceptor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/AcceptorF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/AsyncResult.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/Base64.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/Base64.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/BasicStream.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -87,7 +87,6 @@ const Byte FLAG_IS_LAST_SLICE         = (1<<5);
 
 }
 
-
 IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding) :
     _instance(instance),
     _closure(0),
@@ -1844,13 +1843,16 @@ IceInternal::BasicStream::initReadEncaps()
     if(!_currentReadEncaps->decoder) // Lazy initialization.
     {
         ObjectFactoryManagerPtr factoryManager = _instance->servantFactoryManager();
+        size_t classGraphDepthMax = _instance->classGraphDepthMax();
         if(_currentReadEncaps->encoding == Encoding_1_0)
         {
-            _currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects, factoryManager);
+            _currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects,
+                                                              classGraphDepthMax, factoryManager);
         }
         else
         {
-            _currentReadEncaps->decoder = new EncapsDecoder11(this, _currentReadEncaps, _sliceObjects, factoryManager);
+            _currentReadEncaps->decoder = new EncapsDecoder11(this, _currentReadEncaps, _sliceObjects,
+                                                              classGraphDepthMax, factoryManager);
         }
     }
 }
@@ -1986,6 +1988,7 @@ IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patc
     PatchEntry e;
     e.patchFunc = patchFunc;
     e.patchAddr = patchAddr;
+    e.classGraphDepth = _classGraphDepth;
     q->second.push_back(e);
 }
 
@@ -2375,6 +2378,30 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance()
         startSlice(); // Read next Slice header for next iteration.
     }
 
+    //
+    // Compute the biggest class graph depth of this object. To compute this,
+    // we get the class graph depth of each ancestor from the patch map and
+    // keep the biggest one.
+    //
+    _classGraphDepth = 0;
+    PatchMap::iterator patchPos = _patchMap.find(index);
+    if(patchPos != _patchMap.end())
+    {
+        assert(patchPos->second.size() > 0);
+        for(PatchList::iterator k = patchPos->second.begin(); k != patchPos->second.end(); ++k)
+        {
+            if(k->classGraphDepth > _classGraphDepth)
+            {
+                _classGraphDepth = k->classGraphDepth;
+            }
+        }
+    }
+
+    if(++_classGraphDepth > _classGraphDepthMax)
+    {
+        throw MarshalException(__FILE__, __LINE__, "maximum class graph depth reached");
+    }
+
     //
     // Un-marshal the object and add-it to the map of un-marshaled objects.
     //
@@ -2862,11 +2889,18 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat
         startSlice(); // Read next Slice header for next iteration.
     }
 
+    if(++_classGraphDepth > _classGraphDepthMax)
+    {
+        throw MarshalException(__FILE__, __LINE__, "maximum class graph depth reached");
+    }
+
     //
     // Un-marshal the object
     //
     unmarshal(index, v);
 
+    --_classGraphDepth;
+
     if(!_current && !_patchMap.empty())
     {
         //
@@ -3392,4 +3426,3 @@ IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v)
     _stream->writeSize(1); // Object instance marker.
     v->__write(_stream);
 }
-

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/BatchRequestQueue.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/Buffer.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/BuiltinSequences.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/CollocatedRequestHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/Communicator.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.6.3
+// Ice version 3.6.4
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/CommunicatorI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/ConnectRequestHandler.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -151,15 +151,20 @@ Ice::ConnectionIPtr
 ConnectRequestHandler::getConnection()
 {
     Lock sync(*this);
-    if(_exception.get())
+    //
+    // First check for the connection, it's important otherwise the user could first get a connection
+    // and then the exception if he tries to obtain the proxy cached connection mutiple times (the
+    // exception can be set after the connection is set if the flush of pending requests fails).
+    //
+    if(_connection)
     {
-        _exception->ice_throw();
-        return 0; // Keep the compiler happy.
+        return _connection;
     }
-    else
+    else if(_exception.get())
     {
-        return _connection;
+        _exception->ice_throw();
     }
+    return 0;
 }
 
 Ice::ConnectionIPtr
@@ -195,7 +200,7 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool
 {
     {
         Lock sync(*this);
-        assert(!_exception.get() && !_connection);
+        assert(!_flushing && !_exception.get() && !_connection);
         _connection = connection;
         _compress = compress;
     }
@@ -219,17 +224,17 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool
 void
 ConnectRequestHandler::setException(const Ice::LocalException& ex)
 {
-    Lock sync(*this);
-    assert(!_initialized && !_exception.get());
-    _exception.reset(ex.ice_clone());
-    _proxies.clear();
-    _proxy = 0; // Break cyclic reference count.
+    {
+        Lock sync(*this);
+        assert(!_flushing && !_initialized && !_exception.get());
+        _flushing = true; // Ensures request handler is removed before processing new requests.
+        _exception.reset(ex.ice_clone());
+    }
 
     //
-    // NOTE: remove the request handler *before* notifying the
-    // requests that the connection failed. It's important to ensure
-    // that future invocations will obtain a new connect request
-    // handler once invocations are notified.
+    // NOTE: remove the request handler *before* notifying the requests that the connection
+    // failed. It's important to ensure that future invocations will obtain a new connect
+    // request handler once invocations are notified.
     //
     try
     {
@@ -255,7 +260,14 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex)
         }
     }
     _requests.clear();
-    notifyAll();
+
+    {
+        Lock sync(*this);
+        _flushing = false;
+        _proxies.clear();
+        _proxy = 0; // Break cyclic reference count.
+        notifyAll();
+    }
 }
 
 void
@@ -280,7 +292,7 @@ ConnectRequestHandler::initialized()
     }
     else
     {
-        while(_flushing && !_exception.get())
+        while(_flushing)
         {
             wait();
         }

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/ConnectRequestHandlerF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.