zeroc-ice 3.7.1 → 3.7.6

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/CollocatedRequestHandler.h>
 #include <Ice/ObjectAdapterI.h>
 #include <Ice/ThreadPool.h>
@@ -271,7 +265,7 @@ CollocatedRequestHandler::systemException(Int requestId, const SystemException&
 }
 
 void
-CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int invokeNum, bool amd)
+CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int /*invokeNum*/, bool amd)
 {
     handleException(requestId, ex, amd);
     _adapter->decDirectCount();

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_COLLOCATED_REQUEST_HANDLER_H
 #define ICE_COLLOCATED_REQUEST_HANDLER_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -43,10 +38,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/CommunicatorI.h>
 #include <Ice/Instance.h>
 #include <Ice/Properties.h>
@@ -24,6 +18,9 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
 #include <Ice/UUID.h>
+#ifdef ICE_SWIFT
+#   include <Ice/ThreadPool.h>
+#endif
 
 using namespace std;
 using namespace Ice;
@@ -59,7 +56,7 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con, Ice::Com
         FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
                    const InstancePtr& instance,
                    InvocationObserver& observer) :
-            OutgoingAsyncBase(instance), _outAsync(outAsync), _observer(observer)
+            OutgoingAsyncBase(instance), _outAsync(outAsync), _parentObserver(observer)
         {
         }
 
@@ -83,7 +80,7 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con, Ice::Com
         virtual InvocationObserver&
         getObserver()
         {
-            return _observer;
+            return _parentObserver;
         }
 
         virtual bool handleSent(bool, bool)
@@ -119,7 +116,7 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con, Ice::Com
     private:
 
         const CommunicatorFlushBatchAsyncPtr _outAsync;
-        InvocationObserver& _observer;
+        InvocationObserver& _parentObserver;
     };
 
     {
@@ -384,6 +381,22 @@ Ice::CommunicatorI::getValueFactoryManager() const ICE_NOEXCEPT
     return _instance->initializationData().valueFactoryManager;
 }
 
+#ifdef ICE_SWIFT
+
+dispatch_queue_t
+Ice::CommunicatorI::getClientDispatchQueue() const
+{
+    return _instance->clientThreadPool()->getDispatchQueue();
+}
+
+dispatch_queue_t
+Ice::CommunicatorI::getServerDispatchQueue() const
+{
+    return _instance->serverThreadPool()->getDispatchQueue();
+}
+
+#endif
+
 namespace
 {
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_COMMUNICATOR_I_H
 #define ICE_COMMUNICATOR_I_H
@@ -47,7 +42,6 @@ private:
     void check(bool);
 
     int _useCount;
-    InvocationObserver _observer;
 };
 
 }
@@ -103,6 +97,11 @@ public:
 
     virtual ValueFactoryManagerPtr getValueFactoryManager() const ICE_NOEXCEPT;
 
+#ifdef ICE_SWIFT
+    virtual dispatch_queue_t getClientDispatchQueue() const;
+    virtual dispatch_queue_t getServerDispatchQueue() const;
+#endif
+
 #ifdef ICE_CPP11_MAPPING
     virtual ::std::function<void()>
     flushBatchRequestsAsync(CompressBatch,

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/Cond.h>
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/ConnectRequestHandler.h>
 #include <Ice/ConnectionRequestHandler.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_CONNECT_REQUEST_HANDLER_H
 #define ICE_CONNECT_REQUEST_HANDLER_H
@@ -26,10 +21,10 @@
 namespace IceInternal
 {
 
-class ConnectRequestHandler : public RequestHandler,
-                              public Reference::GetConnectionCallback,
-                              public RouterInfo::AddProxyCallback,
-                              public IceUtil::Monitor<IceUtil::Mutex>
+class ConnectRequestHandler ICE_FINAL : public RequestHandler,
+                                        public Reference::GetConnectionCallback,
+                                        public RouterInfo::AddProxyCallback,
+                                        public IceUtil::Monitor<IceUtil::Mutex>
 #ifdef ICE_CPP11_MAPPING
                             , public std::enable_shared_from_this<ConnectRequestHandler>
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_CONNECT_REQUEST_HANDLER_F_H
 #define ICE_CONNECT_REQUEST_HANDLER_F_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/ConnectionFactory.h>
 #include <Ice/ConnectionI.h>
@@ -53,14 +48,6 @@ IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; }
 namespace
 {
 
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
-
 #ifdef ICE_CPP11_MAPPING
 template <typename Map> void
 remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v)
@@ -160,6 +147,27 @@ private:
     InstancePtr _instance;
 };
 
+#if TARGET_OS_IPHONE != 0
+class FinishCall : public DispatchWorkItem
+{
+public:
+
+    FinishCall(const IncomingConnectionFactoryPtr& factory) : _factory(factory)
+    {
+    }
+
+    virtual void
+    run()
+    {
+        _factory->finish();
+    }
+
+private:
+
+    const IncomingConnectionFactoryPtr _factory;
+};
+#endif
+
 }
 
 bool
@@ -178,10 +186,16 @@ IceInternal::OutgoingConnectionFactory::destroy()
         return;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->destroy(ConnectionI::CommunicatorDestroyed);
+    }
+#else
     for_each(_connections.begin(), _connections.end(),
              bind2nd(Ice::secondVoidMemFun1<const ConnectorPtr, ConnectionI, ConnectionI::DestructionReason>
                      (&ConnectionI::destroy), ConnectionI::CommunicatorDestroyed));
-
+#endif
     _destroyed = true;
     _communicator = 0;
 
@@ -192,8 +206,15 @@ void
 IceInternal::OutgoingConnectionFactory::updateConnectionObservers()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->updateObserver();
+    }
+#else
     for_each(_connections.begin(), _connections.end(),
              Ice::secondVoidMemFun<const ConnectorPtr, ConnectionI>(&ConnectionI::updateObserver));
+#endif
 }
 
 void
@@ -221,9 +242,15 @@ IceInternal::OutgoingConnectionFactory::waitUntilFinished()
         connections = _connections;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->waitUntilFinished();
+    }
+#else
     for_each(connections.begin(), connections.end(),
              Ice::secondVoidMemFun<const ConnectorPtr, ConnectionI>(&ConnectionI::waitUntilFinished));
-
+#endif
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
         // Ensure all the connections are finished and reapable at this point.
@@ -436,7 +463,15 @@ IceInternal::OutgoingConnectionFactory::findConnection(const vector<EndpointIPtr
     assert(!endpoints.empty());
     for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
     {
+#ifdef ICE_CPP11_MAPPING
+        auto connection = find(_connectionsByEndpoint, *p,
+                               [](const ConnectionIPtr& conn)
+                               {
+                                   return conn->isActiveOrHolding();
+                               });
+#else
         ConnectionIPtr connection = find(_connectionsByEndpoint, *p, Ice::constMemFun(&ConnectionI::isActiveOrHolding));
+#endif
         if(connection)
         {
             if(defaultsAndOverrides->overrideCompress)
@@ -466,7 +501,15 @@ IceInternal::OutgoingConnectionFactory::findConnection(const vector<ConnectorInf
             continue;
         }
 
+#ifdef ICE_CPP11_MAPPING
+        auto connection = find(_connections, p->connector,
+                               [](const ConnectionIPtr& conn)
+                               {
+                                   return conn->isActiveOrHolding();
+                               });
+#else
         ConnectionIPtr connection = find(_connections, p->connector, Ice::constMemFun(&ConnectionI::isActiveOrHolding));
+#endif
         if(connection)
         {
             if(defaultsAndOverrides->overrideCompress)
@@ -1193,7 +1236,14 @@ void
 IceInternal::IncomingConnectionFactory::updateConnectionObservers()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : _connections)
+    {
+        conn->updateObserver();
+    }
+#else
     for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::updateObserver));
+#endif
 }
 
 void
@@ -1223,7 +1273,14 @@ IceInternal::IncomingConnectionFactory::waitUntilHolding() const
     //
     // Now we wait until each connection is in holding state.
     //
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : connections)
+    {
+        conn->waitUntilHolding();
+    }
+#else
     for_each(connections.begin(), connections.end(), Ice::constVoidMemFun(&ConnectionI::waitUntilHolding));
+#endif
 }
 
 void
@@ -1253,7 +1310,14 @@ IceInternal::IncomingConnectionFactory::waitUntilFinished()
         connections = _connections;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : connections)
+    {
+        conn->waitUntilFinished();
+    }
+#else
     for_each(connections.begin(), connections.end(), Ice::voidMemFun(&ConnectionI::waitUntilFinished));
+#endif
 
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
@@ -1311,9 +1375,16 @@ IceInternal::IncomingConnectionFactory::connections() const
     //
     // Only copy connections which have not been destroyed.
     //
+#ifdef ICE_CPP11_COMPILER
+    remove_copy_if(_connections.begin(), _connections.end(), back_inserter(result),
+                   [](const ConnectionIPtr& conn)
+                   {
+                       return !conn->isActiveOrHolding();
+                   });
+#else
     remove_copy_if(_connections.begin(), _connections.end(), back_inserter(result),
                    not1(Ice::constMemFun(&ConnectionI::isActiveOrHolding)));
-
+#endif
     return result;
 }
 
@@ -1376,9 +1447,13 @@ IceInternal::IncomingConnectionFactory::finishAsync(SocketOperation)
 
         Error out(_instance->initializationData().logger);
         out << "couldn't accept connection:\n" << ex << '\n' << _acceptor->toString();
-        if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
+        if(_acceptorStarted)
         {
-            closeAcceptor();
+            _acceptorStarted = false;
+            if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
+            {
+                closeAcceptor();
+            }
         }
     }
     return _state < StateClosed;
@@ -1447,6 +1522,8 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current)
                 Error out(_instance->initializationData().logger);
                 out << "can't accept more connections:\n" << ex << '\n' << _acceptor->toString();
 
+                assert(_acceptorStarted);
+                _acceptorStarted = false;
                 if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
                 {
                     closeAcceptor();
@@ -1507,27 +1584,45 @@ IceInternal::IncomingConnectionFactory::finished(ThreadPoolCurrent&, bool close)
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state < StateClosed)
     {
-        if(_acceptorStarted && close)
+        if(close)
         {
             closeAcceptor();
         }
+
+        //
+        // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
+        // because of an unexpected error), try to restart the acceptor in 1 second.
+        //
+        if(!_acceptorStopped)
+        {
+            _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS, _instance),
+                                         IceUtil::Time::seconds(1));
+        }
         return;
     }
 
-    assert(_state == StateClosed);
+    assert(_state >= StateClosed);
     setState(StateFinished);
 
-    if(_acceptorStarted && close)
+    if(close)
     {
         closeAcceptor();
     }
 
 #if TARGET_OS_IPHONE != 0
     sync.release();
-    unregisterForBackgroundNotification(ICE_SHARED_FROM_THIS);
+    finish();
 #endif
 }
 
+#if TARGET_OS_IPHONE != 0
+void
+IceInternal::IncomingConnectionFactory::finish()
+{
+    unregisterForBackgroundNotification(ICE_SHARED_FROM_THIS);
+}
+#endif
+
 string
 IceInternal::IncomingConnectionFactory::toString() const
 {
@@ -1580,7 +1675,7 @@ IceInternal::IncomingConnectionFactory::connectionStartCompleted(const Ice::Conn
 
 void
 IceInternal::IncomingConnectionFactory::connectionStartFailed(const Ice::ConnectionIPtr& /*connection*/,
-                                                              const Ice::LocalException& ex)
+                                                              const Ice::LocalException&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state >= StateClosed)
@@ -1637,7 +1732,7 @@ IceInternal::IncomingConnectionFactory::stopAcceptor()
     }
 
     _acceptorStopped = true;
-
+    _acceptorStarted = false;
     if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
     {
         closeAcceptor();
@@ -1737,7 +1832,14 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 }
                 _adapter->getThreadPool()->_register(ICE_SHARED_FROM_THIS, SocketOperationRead);
             }
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->activate();
+            }
+#else
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::activate));
+#endif
             break;
         }
 
@@ -1756,7 +1858,14 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 }
                 _adapter->getThreadPool()->unregister(ICE_SHARED_FROM_THIS, SocketOperationRead);
             }
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->hold();
+            }
+#else
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::hold));
+#endif
             break;
         }
 
@@ -1771,6 +1880,7 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 // the finish() call. Not all selector implementations do support this
                 // however.
                 //
+                _acceptorStarted = false;
                 if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
                 {
                     closeAcceptor();
@@ -1778,11 +1888,21 @@ IceInternal::IncomingConnectionFactory::setState(State state)
             }
             else
             {
+#if TARGET_OS_IPHONE != 0
+                _adapter->getThreadPool()->dispatch(new FinishCall(ICE_SHARED_FROM_THIS));
+#endif
                 state = StateFinished;
             }
 
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->destroy(ConnectionI::ObjectAdapterDeactivated);
+            }
+#else
             for_each(_connections.begin(), _connections.end(),
                      bind2nd(Ice::voidMemFun1(&ConnectionI::destroy), ConnectionI::ObjectAdapterDeactivated));
+#endif
             break;
         }
 
@@ -1847,16 +1967,6 @@ IceInternal::IncomingConnectionFactory::closeAcceptor()
         out << "stopping to accept " << _endpoint->protocol() << " connections at " << _acceptor->toString();
     }
 
-    _acceptorStarted = false;
+    assert(!_acceptorStarted);
     _acceptor->close();
-
-    //
-    // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
-    // because of an unexpected error), try to restart the acceptor in 1 second.
-    //
-    if(!_acceptorStopped && (_state == StateHolding || _state == StateActive))
-    {
-        _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS, _instance),
-                                     IceUtil::Time::seconds(1));
-    }
 }