zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_FACTORY_H
 #define ICE_CONNECTION_FACTORY_H
@@ -205,6 +200,9 @@ public:
 
     virtual void message(ThreadPoolCurrent&);
     virtual void finished(ThreadPoolCurrent&, bool);
+#if TARGET_OS_IPHONE != 0
+    void finish();
+#endif
     virtual std::string toString() const;
     virtual NativeInfoPtr getNativeInfo();
 

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

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

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/ConnectionI.h>
@@ -493,7 +488,7 @@ Ice::ConnectionI::destroy(DestructionReason reason)
 }
 
 void
-Ice::ConnectionI::close(ConnectionClose mode)
+Ice::ConnectionI::close(ConnectionClose mode) ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
@@ -1147,6 +1142,14 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
                          const IceUtil::Optional<Ice::ACMHeartbeat>& heartbeat)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    if(timeout && *timeout < 0)
+    {
+#ifdef ICE_CPP11_MAPPING
+        throw invalid_argument("invalid negative ACM timeout value");
+#else
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "invalid negative ACM timeout value");
+#endif
+    }
     if(!_monitor || _state >= StateClosed)
     {
         return;
@@ -1174,7 +1177,7 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
 }
 
 ACM
-Ice::ConnectionI::getACM()
+Ice::ConnectionI::getACM() ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     ACM acm;
@@ -1409,25 +1412,21 @@ Ice::ConnectionI::connector() const
 void
 Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter)
 {
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-    if(_state <= StateNotValidated || _state >= StateClosing)
+    if(adapter)
     {
-        return;
+        // Go through the adapter to set the adapter and servant manager on this connection
+        // to ensure the object adapter is still active.
+        dynamic_cast<ObjectAdapterI*>(adapter.get())->setAdapterOnConnection(ICE_SHARED_FROM_THIS);
     }
-
-    _adapter = adapter;
-
-    if(_adapter)
+    else
     {
-        _servantManager = dynamic_cast<ObjectAdapterI*>(_adapter.get())->getServantManager();
-        if(!_servantManager)
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        if(_state <= StateNotValidated || _state >= StateClosing)
         {
-            _adapter = 0;
+            return;
         }
-    }
-    else
-    {
+
+        _adapter = 0;
         _servantManager = 0;
     }
 
@@ -1438,14 +1437,14 @@ Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter)
 }
 
 ObjectAdapterPtr
-Ice::ConnectionI::getAdapter() const
+Ice::ConnectionI::getAdapter() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     return _adapter;
 }
 
 EndpointPtr
-Ice::ConnectionI::getEndpoint() const
+Ice::ConnectionI::getEndpoint() const ICE_NOEXCEPT
 {
     return _endpoint; // No mutex protection necessary, _endpoint is immutable.
 }
@@ -1461,6 +1460,20 @@ Ice::ConnectionI::createProxy(const Identity& ident) const
         _instance->referenceFactory()->create(ident, ICE_SHARED_FROM_CONST_THIS(ConnectionI)));
 }
 
+void
+Ice::ConnectionI::setAdapterAndServantManager(const ObjectAdapterPtr& adapter,
+                                              const IceInternal::ServantManagerPtr& servantManager)
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    if(_state <= StateNotValidated || _state >= StateClosing)
+    {
+        return;
+    }
+    assert(adapter); // Called by ObjectAdapterI::setAdapterOnConnection
+    _adapter = adapter;
+    _servantManager = servantManager;
+}
+
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 bool
 Ice::ConnectionI::startAsync(SocketOperation operation)
@@ -1637,6 +1650,15 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                         _observer->receivedBytes(static_cast<int>(headerSize));
                     }
 
+                    //
+                    // Connection is validated on first message. This is only used by
+                    // setState() to check wether or not we can print a connection
+                    // warning (a client might close the connection forcefully if the
+                    // connection isn't validated, we don't want to print a warning
+                    // in this case).
+                    //
+                    _validated = true;
+
                     ptrdiff_t pos = _readStream.i - _readStream.b.begin();
                     if(pos < headerSize)
                     {
@@ -1651,9 +1673,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                     _readStream.readBlob(m, static_cast<Int>(sizeof(magic)));
                     if(m[0] != magic[0] || m[1] != magic[1] || m[2] != magic[2] || m[3] != magic[3])
                     {
-                        BadMagicException ex(__FILE__, __LINE__);
-                        ex.badMagic = Ice::ByteSeq(&m[0], &m[0] + sizeof(magic));
-                        throw ex;
+                        throw BadMagicException(__FILE__, __LINE__, "", Ice::ByteSeq(&m[0], &m[0] + sizeof(magic)));
                     }
                     ProtocolVersion pv;
                     _readStream.read(pv);
@@ -1664,21 +1684,22 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
 
                     Byte messageType;
                     _readStream.read(messageType);
-                    Byte compress;
-                    _readStream.read(compress);
+                    Byte compressByte;
+                    _readStream.read(compressByte);
                     Int size;
                     _readStream.read(size);
                     if(size < headerSize)
                     {
                         throw IllegalMessageSizeException(__FILE__, __LINE__);
                     }
+
                     if(size > static_cast<Int>(_messageSizeMax))
                     {
-                        Ex::throwMemoryLimitException(__FILE__, __LINE__, size, _messageSizeMax);
+                        Ex::throwMemoryLimitException(__FILE__, __LINE__, static_cast<size_t>(size), _messageSizeMax);
                     }
-                    if(size > static_cast<Int>(_readStream.b.size()))
+                    if(static_cast<size_t>(size) > _readStream.b.size())
                     {
-                        _readStream.b.resize(size);
+                        _readStream.b.resize(static_cast<size_t>(size));
                     }
                     _readStream.i = _readStream.b.begin() + pos;
                 }
@@ -1824,6 +1845,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
         }
     }
 
+// dispatchFromThisThread dispatches to the correct DispatchQueue
+#ifdef ICE_SWIFT
+    _threadPool->dispatchFromThisThread(new DispatchCall(ICE_SHARED_FROM_THIS, startCB, sentCBs, compress, requestId,
+                                                         invokeNum, servantManager, adapter, outAsync,
+                                                         heartbeatCallback, current.stream));
+#else
     if(!_dispatcher) // Optimization, call dispatch() directly if there's no dispatcher.
     {
         dispatch(startCB, sentCBs, compress, requestId, invokeNum, servantManager, adapter, outAsync, heartbeatCallback,
@@ -1836,6 +1863,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                                                              heartbeatCallback, current.stream));
 
     }
+#endif
 }
 
 void
@@ -1987,6 +2015,11 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close)
     }
 
     current.ioCompleted();
+
+// dispatchFromThisThread dispatches to the correct DispatchQueue
+#ifdef ICE_SWIFT
+    _threadPool->dispatchFromThisThread(new FinishCall(ICE_SHARED_FROM_THIS, close));
+#else
     if(!_dispatcher) // Optimization, call finish() directly if there's no dispatcher.
     {
         finish(close);
@@ -1995,6 +2028,7 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close)
     {
         _threadPool->dispatchFromThisThread(new FinishCall(ICE_SHARED_FROM_THIS, close));
     }
+#endif
 }
 
 void
@@ -2140,7 +2174,7 @@ Ice::ConnectionI::finish(bool close)
 }
 
 string
-Ice::ConnectionI::toString() const
+Ice::ConnectionI::toString() const ICE_NOEXCEPT
 {
     return _desc; // No mutex lock, _desc is immutable.
 }
@@ -2170,13 +2204,13 @@ Ice::ConnectionI::timedOut()
 }
 
 string
-Ice::ConnectionI::type() const
+Ice::ConnectionI::type() const ICE_NOEXCEPT
 {
     return _type; // No mutex lock, _type is immutable.
 }
 
 Ice::Int
-Ice::ConnectionI::timeout() const
+Ice::ConnectionI::timeout() const ICE_NOEXCEPT
 {
     return _endpoint->timeout(); // No mutex lock, _endpoint is immutable.
 }
@@ -2713,6 +2747,8 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 _observer.finishRead(_readStream);
             }
 
+            _validated = true;
+
             assert(_readStream.i == _readStream.b.end());
             _readStream.i = _readStream.b.begin();
             Byte m[4];
@@ -2722,9 +2758,7 @@ Ice::ConnectionI::validate(SocketOperation operation)
             _readStream.read(m[3]);
             if(m[0] != magic[0] || m[1] != magic[1] || m[2] != magic[2] || m[3] != magic[3])
             {
-                BadMagicException ex(__FILE__, __LINE__);
-                ex.badMagic = Ice::ByteSeq(&m[0], &m[0] + sizeof(magic));
-                throw ex;
+                throw BadMagicException(__FILE__, __LINE__, "", Ice::ByteSeq(&m[0], &m[0] + sizeof(magic)));
             }
             ProtocolVersion pv;
             _readStream.read(pv);
@@ -2747,8 +2781,6 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 throw IllegalMessageSizeException(__FILE__, __LINE__);
             }
             traceRecv(_readStream, _logger, _traceLevels);
-
-            _validated = true;
         }
     }
 
@@ -3138,9 +3170,7 @@ Ice::ConnectionI::doCompress(OutputStream& uncompressed, OutputStream& compresse
                                            _compressionLevel, 0, 0);
     if(bzError != BZ_OK)
     {
-        CompressionException ex(__FILE__, __LINE__);
-        ex.reason = "BZ2_bzBuffToBuffCompress failed" + getBZ2Error(bzError);
-        throw ex;
+        throw CompressionException(__FILE__, __LINE__, "BZ2_bzBuffToBuffCompress failed" + getBZ2Error(bzError));
     }
     compressed.b.resize(headerSize + sizeof(Int) + compressedLen);
 
@@ -3188,11 +3218,11 @@ Ice::ConnectionI::doUncompress(InputStream& compressed, InputStream& uncompresse
 
     if(uncompressedSize > static_cast<Int>(_messageSizeMax))
     {
-        Ex::throwMemoryLimitException(__FILE__, __LINE__, uncompressedSize, _messageSizeMax);
+        Ex::throwMemoryLimitException(__FILE__, __LINE__, static_cast<size_t>(uncompressedSize), _messageSizeMax);
     }
-    uncompressed.resize(uncompressedSize);
+    uncompressed.resize(static_cast<size_t>(uncompressedSize));
 
-    unsigned int uncompressedLen = uncompressedSize - headerSize;
+    unsigned int uncompressedLen = static_cast<unsigned int>(uncompressedSize - headerSize);
     unsigned int compressedLen = static_cast<unsigned int>(compressed.b.size() - headerSize - sizeof(Int));
     int bzError = BZ2_bzBuffToBuffDecompress(reinterpret_cast<char*>(&uncompressed.b[0]) + headerSize,
                                              &uncompressedLen,
@@ -3201,9 +3231,7 @@ Ice::ConnectionI::doUncompress(InputStream& compressed, InputStream& uncompresse
                                              0, 0);
     if(bzError != BZ_OK)
     {
-        CompressionException ex(__FILE__, __LINE__);
-        ex.reason = "BZ2_bzBuffToBuffCompress failed" + getBZ2Error(bzError);
-        throw ex;
+        throw CompressionException(__FILE__, __LINE__, "BZ2_bzBuffToBuffCompress failed" + getBZ2Error(bzError));
     }
 
     copy(compressed.b.begin(), compressed.b.begin() + headerSize, uncompressed.b.begin());
@@ -3225,14 +3253,6 @@ Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& request
 
     assert(stream.i == stream.b.end());
 
-    //
-    // Connection is validated on first message. This is only used by
-    // setState() to check wether or not we can print a connection
-    // warning (a client might close the connection forcefully if the
-    // connection isn't validated).
-    //
-    _validated = true;
-
     try
     {
         //
@@ -3253,9 +3273,7 @@ Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& request
             doUncompress(stream, ustream);
             stream.b.swap(ustream.b);
 #else
-            FeatureNotSupportedException ex(__FILE__, __LINE__);
-            ex.unsupportedFeature = "Cannot uncompress compressed message";
-            throw ex;
+            throw FeatureNotSupportedException(__FILE__, __LINE__, "Cannot uncompress compressed message");
 #endif
         }
         stream.i = stream.b.begin() + headerSize;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_I_H
 #define ICE_CONNECTION_I_H
@@ -156,7 +151,7 @@ public:
     void activate();
     void hold();
     void destroy(DestructionReason);
-    virtual void close(ConnectionClose); // From Connection.
+    virtual void close(ConnectionClose) ICE_NOEXCEPT; // From Connection.
 
     bool isActiveOrHolding() const;
     bool isFinished() const;
@@ -209,7 +204,7 @@ public:
     virtual void setACM(const IceUtil::Optional<int>&,
                         const IceUtil::Optional<ACMClose>&,
                         const IceUtil::Optional<ACMHeartbeat>&);
-    virtual ACM getACM();
+    virtual ACM getACM() ICE_NOEXCEPT;
 
     virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, const LocalException&);
 
@@ -222,10 +217,12 @@ public:
     IceInternal::ConnectorPtr connector() const;
 
     virtual void setAdapter(const ObjectAdapterPtr&); // From Connection.
-    virtual ObjectAdapterPtr getAdapter() const; // From Connection.
-    virtual EndpointPtr getEndpoint() const; // From Connection.
+    virtual ObjectAdapterPtr getAdapter() const ICE_NOEXCEPT; // From Connection.
+    virtual EndpointPtr getEndpoint() const ICE_NOEXCEPT; // From Connection.
     virtual ObjectPrxPtr createProxy(const Identity& ident) const; // From Connection.
 
+    void setAdapterAndServantManager(const ObjectAdapterPtr&, const IceInternal::ServantManagerPtr&);
+
     //
     // Operations from EventHandler
     //
@@ -236,13 +233,13 @@ public:
 
     virtual void message(IceInternal::ThreadPoolCurrent&);
     virtual void finished(IceInternal::ThreadPoolCurrent&, bool);
-    virtual std::string toString() const; // From Connection and EvantHandler.
+    virtual std::string toString() const ICE_NOEXCEPT; // From Connection and EvantHandler.
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
     void timedOut();
 
-    virtual std::string type() const; // From Connection.
-    virtual Ice::Int timeout() const; // From Connection.
+    virtual std::string type() const ICE_NOEXCEPT; // From Connection.
+    virtual Ice::Int timeout() const ICE_NOEXCEPT; // From Connection.
     virtual ConnectionInfoPtr getInfo() const; // From Connection
 
     virtual void setBufferSize(Ice::Int rcvSize, Ice::Int sndSize); // From Connection

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/ConnectionRequestHandler.h>
 #include <Ice/Proxy.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_REQUEST_HANDLER_H
 #define ICE_CONNECTION_REQUEST_HANDLER_H
@@ -17,7 +12,7 @@
 namespace IceInternal
 {
 
-class ConnectionRequestHandler : public RequestHandler
+class ConnectionRequestHandler ICE_FINAL : public RequestHandler
 #ifdef ICE_CPP11_MAPPING
                                , public std::enable_shared_from_this<ConnectionRequestHandler>
 #endif