zeroc-ice 3.7.0 → 3.7.1

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -201,21 +201,42 @@ Ice::CommunicatorI::destroy() ICE_NOEXCEPT
 }
 
 void
-Ice::CommunicatorI::shutdown()
+Ice::CommunicatorI::shutdown() ICE_NOEXCEPT
 {
-    _instance->objectAdapterFactory()->shutdown();
+    try
+    {
+        _instance->objectAdapterFactory()->shutdown();
+    }
+    catch(const Ice::CommunicatorDestroyedException&)
+    {
+        // Ignore
+    }
 }
 
 void
-Ice::CommunicatorI::waitForShutdown()
+Ice::CommunicatorI::waitForShutdown() ICE_NOEXCEPT
 {
-    _instance->objectAdapterFactory()->waitForShutdown();
+    try
+    {
+        _instance->objectAdapterFactory()->waitForShutdown();
+    }
+    catch(const Ice::CommunicatorDestroyedException&)
+    {
+        // Ignore
+    }
 }
 
 bool
-Ice::CommunicatorI::isShutdown() const
+Ice::CommunicatorI::isShutdown() const ICE_NOEXCEPT
 {
-    return _instance->objectAdapterFactory()->isShutdown();
+    try
+    {
+        return _instance->objectAdapterFactory()->isShutdown();
+    }
+    catch(const Ice::CommunicatorDestroyedException&)
+    {
+        return true;
+    }
 }
 
 ObjectPrxPtr
@@ -298,25 +319,25 @@ Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, con
 }
 
 ::Ice::ObjectFactoryPtr
-Ice::CommunicatorI::findObjectFactory(const string& id) const
+Ice::CommunicatorI::findObjectFactory(const string& id) const ICE_NOEXCEPT
 {
     return _instance->findObjectFactory(id);
 }
 
 PropertiesPtr
-Ice::CommunicatorI::getProperties() const
+Ice::CommunicatorI::getProperties() const ICE_NOEXCEPT
 {
     return _instance->initializationData().properties;
 }
 
 LoggerPtr
-Ice::CommunicatorI::getLogger() const
+Ice::CommunicatorI::getLogger() const ICE_NOEXCEPT
 {
     return _instance->initializationData().logger;
 }
 
 Ice::Instrumentation::CommunicatorObserverPtr
-Ice::CommunicatorI::getObserver() const
+Ice::CommunicatorI::getObserver() const ICE_NOEXCEPT
 {
     return _instance->initializationData().observer;
 }
@@ -346,7 +367,7 @@ Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator)
 }
 
 Ice::ImplicitContextPtr
-Ice::CommunicatorI::getImplicitContext() const
+Ice::CommunicatorI::getImplicitContext() const ICE_NOEXCEPT
 {
     return _instance->getImplicitContext();
 }
@@ -358,7 +379,7 @@ Ice::CommunicatorI::getPluginManager() const
 }
 
 ValueFactoryManagerPtr
-Ice::CommunicatorI::getValueFactoryManager() const
+Ice::CommunicatorI::getValueFactoryManager() const ICE_NOEXCEPT
 {
     return _instance->initializationData().valueFactoryManager;
 }

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -67,9 +67,9 @@ class CommunicatorI : public Communicator
 public:
 
     virtual void destroy() ICE_NOEXCEPT;
-    virtual void shutdown();
-    virtual void waitForShutdown();
-    virtual bool isShutdown() const;
+    virtual void shutdown() ICE_NOEXCEPT;
+    virtual void waitForShutdown() ICE_NOEXCEPT;
+    virtual bool isShutdown() const ICE_NOEXCEPT;
 
     virtual ObjectPrxPtr stringToProxy(const std::string&) const;
     virtual std::string proxyToString(const ObjectPrxPtr&) const;
@@ -85,13 +85,13 @@ public:
     virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrxPtr&);
 
     virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&);
-    virtual ObjectFactoryPtr findObjectFactory(const std::string&) const;
+    virtual ObjectFactoryPtr findObjectFactory(const std::string&) const ICE_NOEXCEPT;
 
-    virtual ImplicitContextPtr getImplicitContext() const;
+    virtual ImplicitContextPtr getImplicitContext() const ICE_NOEXCEPT;
 
-    virtual PropertiesPtr getProperties() const;
-    virtual LoggerPtr getLogger() const;
-    virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const;
+    virtual PropertiesPtr getProperties() const ICE_NOEXCEPT;
+    virtual LoggerPtr getLogger() const ICE_NOEXCEPT;
+    virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const ICE_NOEXCEPT;
 
     virtual RouterPrxPtr getDefaultRouter() const;
     virtual void setDefaultRouter(const RouterPrxPtr&);
@@ -101,7 +101,7 @@ public:
 
     virtual PluginManagerPtr getPluginManager() const;
 
-    virtual ValueFactoryManagerPtr getValueFactoryManager() const;
+    virtual ValueFactoryManagerPtr getValueFactoryManager() const ICE_NOEXCEPT;
 
 #ifdef ICE_CPP11_MAPPING
     virtual ::std::function<void()>

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -103,15 +103,20 @@ Ice::ConnectionIPtr
 ConnectRequestHandler::getConnection()
 {
     Lock sync(*this);
-    if(_exception)
+    //
+    // 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)
     {
-        return _connection;
+        _exception->ice_throw();
     }
+    return ICE_NULLPTR;
 }
 
 Ice::ConnectionIPtr

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

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -42,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -93,49 +93,65 @@ Ice::ConnectionInfo::~ConnectionInfo()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ConnectionInfo* p) { return p; }
+/// \endcond
 
 Ice::CloseCallback::~CloseCallback()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::CloseCallback* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(CloseCallback* p) { return p; }
+/// \endcond
 
 Ice::HeartbeatCallback::~HeartbeatCallback()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::HeartbeatCallback* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(HeartbeatCallback* p) { return p; }
+/// \endcond
 
 Ice::Connection::~Connection()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Connection* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Connection* p) { return p; }
+/// \endcond
 
 Ice::IPConnectionInfo::~IPConnectionInfo()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::IPConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(IPConnectionInfo* p) { return p; }
+/// \endcond
 
 Ice::TCPConnectionInfo::~TCPConnectionInfo()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::TCPConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(TCPConnectionInfo* p) { return p; }
+/// \endcond
 
 Ice::UDPConnectionInfo::~UDPConnectionInfo()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::UDPConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(UDPConnectionInfo* p) { return p; }
+/// \endcond
 
 Ice::WSConnectionInfo::~WSConnectionInfo()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::WSConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(WSConnectionInfo* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

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

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -128,22 +128,36 @@ find(const multimap<K,::IceInternal::Handle<V> >& m,
 #endif
 
 class StartAcceptor : public IceUtil::TimerTask
+#ifdef ICE_CPP11_MAPPING
+                    , public std::enable_shared_from_this<StartAcceptor>
+#endif
 {
 public:
 
-    StartAcceptor(const IncomingConnectionFactoryPtr& factory) : _factory(factory)
+    StartAcceptor(const IncomingConnectionFactoryPtr& factory, const InstancePtr& instance) :
+        _factory(factory), _instance(instance)
     {
     }
 
     void
     runTimerTask()
     {
-        _factory->startAcceptor();
+        try
+        {
+            _factory->startAcceptor();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            Error out(_instance->initializationData().logger);
+            out << "acceptor creation failed:\n" << ex << '\n' << _factory->toString();
+            _instance->timer()->schedule(ICE_SHARED_FROM_THIS, IceUtil::Time::seconds(1));
+        }
     }
 
 private:
 
     IncomingConnectionFactoryPtr _factory;
+    InstancePtr _instance;
 };
 
 }
@@ -271,6 +285,10 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt
 void
 IceInternal::OutgoingConnectionFactory::setRouterInfo(const RouterInfoPtr& routerInfo)
 {
+    assert(routerInfo);
+    ObjectAdapterPtr adapter = routerInfo->getAdapter();
+    vector<EndpointIPtr> endpoints = routerInfo->getClientEndpoints(); // Must be called outside the synchronization
+
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
     if(_destroyed)
@@ -278,16 +296,12 @@ IceInternal::OutgoingConnectionFactory::setRouterInfo(const RouterInfoPtr& route
         throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
 
-    assert(routerInfo);
-
     //
     // Search for connections to the router's client proxy endpoints,
     // and update the object adapter for such connections, so that
     // callbacks from the router can be received over such
     // connections.
     //
-    ObjectAdapterPtr adapter = routerInfo->getAdapter();
-    vector<EndpointIPtr> endpoints = routerInfo->getClientEndpoints();
     for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
     {
         EndpointIPtr endpoint = *p;
@@ -1610,17 +1624,7 @@ IceInternal::IncomingConnectionFactory::startAcceptor()
     }
 
     _acceptorStopped = false;
-
-    try
-    {
-        createAcceptor();
-    }
-    catch(const Ice::Exception& ex)
-    {
-        Error out(_instance->initializationData().logger);
-        out << "acceptor creation failed:\n" << ex << '\n' << _acceptor->toString();
-        _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS), IceUtil::Time::seconds(1));
-    }
+    createAcceptor();
 }
 
 void
@@ -1852,6 +1856,7 @@ IceInternal::IncomingConnectionFactory::closeAcceptor()
     //
     if(!_acceptorStopped && (_state == StateHolding || _state == StateActive))
     {
-        _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS), IceUtil::Time::seconds(1));
+        _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS, _instance),
+                                     IceUtil::Time::seconds(1));
     }
 }

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

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

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