zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/ObjectAdapter.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.6.5
+// Ice version 3.7.4
 //
 // <auto-generated>
 //
@@ -23,25 +18,62 @@
 #endif
 #include <Ice/ObjectAdapter.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/LocalException.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/OutgoingAsync.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/LocalException.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   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 < 5
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
 namespace
 {
 
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectAdapter* p) { return p; }
+Ice::ObjectAdapter::~ObjectAdapter()
+{
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+Ice::ObjectAdapter::~ObjectAdapter()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ObjectAdapter* p) { return p; }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/ObjectAdapterF.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.6.5
+// Ice version 3.7.4
 //
 // <auto-generated>
 //
@@ -23,22 +18,44 @@
 #endif
 #include <Ice/ObjectAdapterF.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <IceUtil/Iterator.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   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 < 5
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
 namespace
 {
 
 }
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+namespace Ice
+{
+}
+
+#endif

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

@@ -1,24 +1,21 @@
-// **********************************************************************
 //
-// 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/ObjectAdapterFactory.h>
 #include <Ice/ObjectAdapterI.h>
 #include <Ice/Object.h>
 #include <Ice/LocalException.h>
 #include <Ice/Functional.h>
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ObjectAdapterFactory* p) { return p; }
+#endif
 
 void
 IceInternal::ObjectAdapterFactory::shutdown()
@@ -39,8 +36,8 @@ IceInternal::ObjectAdapterFactory::shutdown()
 
         adapters = _adapters;
 
-        _instance = 0;
-        _communicator = 0;
+        _instance = ICE_NULLPTR;
+        _communicator = ICE_NULLPTR;
 
         notifyAll();
     }
@@ -49,7 +46,11 @@ IceInternal::ObjectAdapterFactory::shutdown()
     // Deactivate outside the thread synchronization, to avoid
     // deadlocks.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->deactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::deactivate));
+#endif
 }
 
 void
@@ -74,7 +75,11 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
     //
     // Now we wait for deactivation of each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->waitForDeactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::waitForDeactivate));
+#endif
 }
 
 bool
@@ -103,8 +108,11 @@ IceInternal::ObjectAdapterFactory::destroy()
     //
     // Now we destroy each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->destroy(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::destroy));
-
+#endif
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         _adapters.clear();
@@ -120,44 +128,85 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         adapters = _adapters;
     }
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(),
+        [fn](const ObjectAdapterIPtr& adapter)
+        {
+            (adapter.get() ->* fn)();
+        });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(fn));
+#endif
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrx& router)
+IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrxPtr& router)
 {
-    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
-    if(!_instance)
+    ObjectAdapterIPtr adapter;
     {
-        throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+        if(!_instance)
+        {
+            throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        }
+
+        if(name.empty())
+        {
+            string uuid = Ice::generateUUID();
+            adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
+        }
+        else
+        {
+            if(_adapterNamesInUse.find(name) != _adapterNamesInUse.end())
+            {
+                throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
+            }
+            adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
+            _adapterNamesInUse.insert(name);
+        }
     }
 
-    ObjectAdapterIPtr adapter;
-    if(name.empty())
+    //
+    // Must be called outside the synchronization since initialize can make client invocations
+    // on the router if it's set.
+    //
+    bool initialized = false;
+    try
     {
-        string uuid = IceUtil::generateUUID();
-        adapter = new ObjectAdapterI(_instance, _communicator, this, uuid, true);
-        adapter->initialize(0);
+        adapter->initialize(router);
+        initialized = true;
+
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+        if(!_instance)
+        {
+            throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        }
+        _adapters.push_back(adapter);
     }
-    else
+    catch(const Ice::CommunicatorDestroyedException&)
     {
-        if(_adapterNamesInUse.find(name) != _adapterNamesInUse.end())
+        if(initialized)
         {
-            throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
+            adapter->destroy();
         }
-        adapter = new ObjectAdapterI(_instance, _communicator, this, name, false);
-        adapter->initialize(router);
-        _adapterNamesInUse.insert(name);
+        throw;
+    }
+    catch(const std::exception&)
+    {
+        if(!name.empty())
+        {
+            IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+            _adapterNamesInUse.erase(name);
+        }
+        throw;
     }
 
-    _adapters.push_back(adapter);
     return adapter;
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
+IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrxPtr& proxy)
 {
     list<ObjectAdapterIPtr> adapters;
     {
@@ -165,7 +214,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
 
         if(!_instance)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         adapters = _adapters;
@@ -186,7 +235,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
         }
     }
 
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
@@ -211,7 +260,8 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a
 }
 
 void
-IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) const
+IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync,
+                                                           CompressBatch compressBatch) const
 {
     list<ObjectAdapterIPtr> adapters;
     {
@@ -222,7 +272,7 @@ IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlu
 
     for(list<ObjectAdapterIPtr>::const_iterator p = adapters.begin(); p != adapters.end(); ++p)
     {
-        (*p)->flushAsyncBatchRequests(outAsync);
+        (*p)->flushAsyncBatchRequests(outAsync, compressBatch);
     }
 }
 

data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.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_OBJECT_ADAPTER_FACTORY_H
 #define ICE_OBJECT_ADAPTER_FACTORY_H
@@ -19,7 +14,12 @@
 namespace IceInternal
 {
 
-class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Monitor< ::IceUtil::RecMutex>
+class ObjectAdapterFactory : public ::IceUtil::Monitor< ::IceUtil::RecMutex>,
+#ifdef ICE_CPP11_MAPPING
+                             public std::enable_shared_from_this<ObjectAdapterFactory>
+#else
+                             public virtual IceUtil::Shared
+#endif
 {
 public:
 
@@ -30,15 +30,16 @@ public:
 
     void updateObservers(void (Ice::ObjectAdapterI::*)());
 
-    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&);
-    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&);
+    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrxPtr&);
+    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrxPtr&);
     void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&);
-    void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const;
-
-private:
+    void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&, ::Ice::CompressBatch) const;
 
     ObjectAdapterFactory(const InstancePtr&, const ::Ice::CommunicatorPtr&);
     virtual ~ObjectAdapterFactory();
+
+private:
+
     friend class Instance;
 
     InstancePtr _instance;

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

@@ -0,0 +1,25 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
+#define ICE_OBJECT_ADAPTER_FACTORY_F_H
+
+#include <IceUtil/Shared.h>
+
+#include <Ice/Handle.h>
+
+namespace IceInternal
+{
+
+class ObjectAdapterFactory;
+#ifdef ICE_CPP11_MAPPING
+using ObjectAdapterFactoryPtr = ::std::shared_ptr<ObjectAdapterFactory>;
+#else
+IceUtil::Shared* upCast(ObjectAdapterFactory*);
+typedef IceInternal::Handle<ObjectAdapterFactory> ObjectAdapterFactoryPtr;
+#endif
+
+}
+
+#endif

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

@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// 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/UUID.h>
+#include <Ice/UUID.h>
 #include <Ice/ObjectAdapterI.h>
+#include <Ice/CommunicatorI.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Instance.h>
 #include <Ice/Proxy.h>
@@ -31,6 +27,7 @@
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/PropertyNames.h>
+#include <Ice/ConsoleUtil.h>
 
 #ifdef _WIN32
 #   include <sys/timeb.h>
@@ -61,10 +58,16 @@ inline void checkServant(const ObjectPtr& servant)
         throw IllegalServantException(__FILE__, __LINE__, "cannot add null servant to Object Adapter");
     }
 }
+
+inline EndpointIPtr toEndpointI(const EndpointPtr& endp)
+{
+    return ICE_DYNAMIC_CAST(EndpointI, endp);
+}
+
 }
 
 string
-Ice::ObjectAdapterI::getName() const
+Ice::ObjectAdapterI::getName() const ICE_NOEXCEPT
 {
     //
     // No mutex lock necessary, _name is immutable.
@@ -73,7 +76,7 @@ Ice::ObjectAdapterI::getName() const
 }
 
 CommunicatorPtr
-Ice::ObjectAdapterI::getCommunicator() const
+Ice::ObjectAdapterI::getCommunicator() const ICE_NOEXCEPT
 {
     return _communicator;
 }
@@ -95,8 +98,16 @@ Ice::ObjectAdapterI::activate()
         //
         if(_state != StateUninitialized)
         {
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
             for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                      Ice::voidMemFun(&IncomingConnectionFactory::activate));
+#endif
             return;
         }
 
@@ -141,16 +152,23 @@ Ice::ObjectAdapterI::activate()
 
     if(printAdapterReady)
     {
-        cout << _name << " ready" << endl;
+        consoleOut << _name << " ready" << endl;
     }
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         assert(_state == StateActivating);
 
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
         for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                  Ice::voidMemFun(&IncomingConnectionFactory::activate));
-
+#endif
         _state = StateActive;
         notifyAll();
     }
@@ -164,8 +182,16 @@ Ice::ObjectAdapterI::hold()
     checkForDeactivation();
     _state = StateHeld;
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->hold();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::hold));
+#endif
 }
 
 void
@@ -180,12 +206,20 @@ Ice::ObjectAdapterI::waitForHold()
         incomingConnectionFactories = _incomingConnectionFactories;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilHolding();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::constVoidMemFun(&IncomingConnectionFactory::waitUntilHolding));
+#endif
 }
 
 void
-Ice::ObjectAdapterI::deactivate()
+Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT
 {
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -210,21 +244,21 @@ Ice::ObjectAdapterI::deactivate()
     // facatory list are immutable at this point.
     //
 
-    if(_routerInfo)
+    try
     {
-        //
-        // Remove entry from the router manager.
-        //
-        _instance->routerManager()->erase(_routerInfo->getRouter());
+        if(_routerInfo)
+        {
+            //
+            // Remove entry from the router manager.
+            //
+            _instance->routerManager()->erase(_routerInfo->getRouter());
 
-        //
-        //  Clear this object adapter with the router.
-        //
-        _routerInfo->setAdapter(0);
-    }
+            //
+            //  Clear this object adapter with the router.
+            //
+            _routerInfo->setAdapter(0);
+        }
 
-    try
-    {
         updateLocatorRegistry(_locatorInfo, 0);
     }
     catch(const Ice::LocalException&)
@@ -235,20 +269,18 @@ Ice::ObjectAdapterI::deactivate()
         //
     }
 
-    //
-    // Must be called outside the thread synchronization, because
-    // Connection::destroy() might block when sending a CloseConnection
-    // message.
-    //
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->destroy();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::destroy));
+#endif
 
-    //
-    // Must be called outside the thread synchronization, because
-    // changing the object adapter might block if there are still
-    // requests being dispatched.
-    //
-    _instance->outgoingConnectionFactory()->removeAdapter(this);
+    _instance->outgoingConnectionFactory()->removeAdapter(ICE_SHARED_FROM_THIS);
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -259,7 +291,7 @@ Ice::ObjectAdapterI::deactivate()
 }
 
 void
-Ice::ObjectAdapterI::waitForDeactivate()
+Ice::ObjectAdapterI::waitForDeactivate() ICE_NOEXCEPT
 {
     vector<IceInternal::IncomingConnectionFactoryPtr> incomingConnectionFactories;
 
@@ -285,12 +317,20 @@ Ice::ObjectAdapterI::waitForDeactivate()
     // Now we wait until all incoming connection factories are
     // finished.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilFinished();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::waitUntilFinished));
+#endif
 }
 
 bool
-Ice::ObjectAdapterI::isDeactivated() const
+Ice::ObjectAdapterI::isDeactivated() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -298,7 +338,7 @@ Ice::ObjectAdapterI::isDeactivated() const
 }
 
 void
-Ice::ObjectAdapterI::destroy()
+Ice::ObjectAdapterI::destroy() ICE_NOEXCEPT
 {
     //
     // Deactivate and wait for completion.
@@ -343,7 +383,7 @@ Ice::ObjectAdapterI::destroy()
 
     if(_objectAdapterFactory)
     {
-        _objectAdapterFactory->removeObjectAdapter(this);
+        _objectAdapterFactory->removeObjectAdapter(ICE_SHARED_FROM_THIS);
     }
 
     {
@@ -360,7 +400,6 @@ Ice::ObjectAdapterI::destroy()
         //
         _instance = 0;
         _threadPool = 0;
-        _routerEndpoints.clear();
         _routerInfo = 0;
         _publishedEndpoints.clear();
         _locatorInfo = 0;
@@ -372,13 +411,13 @@ Ice::ObjectAdapterI::destroy()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::add(const ObjectPtr& object, const Identity& ident)
 {
     return addFacet(object, ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, const string& facet)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -392,17 +431,17 @@ Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, co
     return newProxy(ident, facet);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addWithUUID(const ObjectPtr& object)
 {
     return addFacetWithUUID(object, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& facet)
 {
     Identity ident;
-    ident.name = IceUtil::generateUUID();
+    ident.name = Ice::generateUUID();
     return addFacet(object, ident, facet);
 }
 
@@ -484,13 +523,13 @@ Ice::ObjectAdapterI::findAllFacets(const Identity& ident) const
 }
 
 ObjectPtr
-Ice::ObjectAdapterI::findByProxy(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::findByProxy(const ObjectPrxPtr& proxy) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
     checkForDeactivation();
 
-    ReferencePtr ref = proxy->__reference();
+    ReferencePtr ref = proxy->_getReference();
     return findFacet(ref->getIdentity(), ref->getFacet());
 }
 
@@ -534,7 +573,7 @@ Ice::ObjectAdapterI::findServantLocator(const string& prefix) const
     return _servantManager->findServantLocator(prefix);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -545,7 +584,7 @@ Ice::ObjectAdapterI::createProxy(const Identity& ident) const
     return newProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -556,7 +595,7 @@ Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
     return newDirectProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -568,7 +607,7 @@ Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 }
 
 void
-Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
+Ice::ObjectAdapterI::setLocator(const LocatorPrxPtr& locator)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -577,8 +616,8 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
     _locatorInfo = _instance->locatorManager()->get(locator);
 }
 
-LocatorPrx
-Ice::ObjectAdapterI::getLocator() const
+LocatorPrxPtr
+Ice::ObjectAdapterI::getLocator() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -592,6 +631,24 @@ Ice::ObjectAdapterI::getLocator() const
     }
 }
 
+EndpointSeq
+Ice::ObjectAdapterI::getEndpoints() const ICE_NOEXCEPT
+{
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+    EndpointSeq endpoints;
+    transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+            back_inserter(endpoints),
+#ifdef ICE_CPP11_MAPPING
+            [](const IncomingConnectionFactoryPtr& factory)
+            {
+                return factory->endpoint();
+            });
+#else
+            Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+#endif
+    return endpoints;
+}
 
 void
 Ice::ObjectAdapterI::refreshPublishedEndpoints()
@@ -601,11 +658,10 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
         checkForDeactivation();
 
         oldPublishedEndpoints = _publishedEndpoints;
-        _publishedEndpoints = parsePublishedEndpoints();
+        _publishedEndpoints = computePublishedEndpoints();
 
         locatorInfo = _locatorInfo;
     }
@@ -629,35 +685,77 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
 }
 
 EndpointSeq
-Ice::ObjectAdapterI::getEndpoints() const
+Ice::ObjectAdapterI::getPublishedEndpoints() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+    return EndpointSeq(_publishedEndpoints.begin(), _publishedEndpoints.end());
+}
 
-    EndpointSeq endpoints;
-    transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
-              back_inserter(endpoints), Ice::constMemFun(&IncomingConnectionFactory::endpoint));
-    return endpoints;
+void
+Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints)
+{
+    LocatorInfoPtr locatorInfo;
+    vector<EndpointIPtr> oldPublishedEndpoints;
+    {
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+        checkForDeactivation();
+
+        if(_routerInfo)
+        {
+            const string s("can't set published endpoints on object adapter associated with a router");
+    #ifdef ICE_CPP11_MAPPING
+            throw invalid_argument(s);
+    #else
+            throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, s);
+    #endif
+        }
+
+        oldPublishedEndpoints = _publishedEndpoints;
+        _publishedEndpoints.clear();
+        transform(newEndpoints.begin(), newEndpoints.end(), back_inserter(_publishedEndpoints), toEndpointI);
+
+        locatorInfo = _locatorInfo;
+    }
+
+    try
+    {
+        Ice::Identity dummy;
+        dummy.name = "dummy";
+        updateLocatorRegistry(locatorInfo, createDirectProxy(dummy));
+    }
+    catch(const Ice::LocalException&)
+    {
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+        //
+        // Restore the old published endpoints.
+        //
+        _publishedEndpoints = oldPublishedEndpoints;
+        throw;
+    }
 }
 
-EndpointSeq
-Ice::ObjectAdapterI::getPublishedEndpoints() const
+#ifdef ICE_SWIFT
+dispatch_queue_t
+Ice::ObjectAdapterI::getDispatchQueue() const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
-    EndpointSeq endpoints;
-    copy(_publishedEndpoints.begin(), _publishedEndpoints.end(), back_inserter(endpoints));
-    return endpoints;
+    checkForDeactivation();
+
+    return getThreadPool()->getDispatchQueue();
 }
+#endif
 
 bool
-Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const
 {
     //
     // NOTE: it's important that isLocal() doesn't perform any blocking operations as
     // it can be called for AMI invocations if the proxy has no delegate set yet.
     //
 
-    ReferencePtr ref = proxy->__reference();
+    ReferencePtr ref = proxy->_getReference();
     if(ref->isWellKnown())
     {
         //
@@ -690,7 +788,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
             for(vector<IncomingConnectionFactoryPtr>::const_iterator q = _incomingConnectionFactories.begin();
                 q != _incomingConnectionFactories.end(); ++q)
             {
-                if((*p)->equivalent((*q)->endpoint()))
+                if((*q)->isLocal(*p))
                 {
                     return true;
                 }
@@ -705,32 +803,13 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
                 }
             }
         }
-
-        //
-        // Proxies which have at least one endpoint in common with the
-        // router's server proxy endpoints (if any), are also considered
-        // local.
-        //
-        if(_routerInfo && _routerInfo->getRouter() == proxy->ice_getRouter())
-        {
-            for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
-            {
-                for(vector<EndpointIPtr>::const_iterator r = _routerEndpoints.begin(); r != _routerEndpoints.end(); ++r)
-                {
-                    if((*p)->equivalent(*r))
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
     }
 
     return false;
 }
 
 void
-Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
+Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync, CompressBatch compress)
 {
     vector<IncomingConnectionFactoryPtr> f;
     {
@@ -740,7 +819,7 @@ Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPt
 
     for(vector<IncomingConnectionFactoryPtr>::const_iterator p = f.begin(); p != f.end(); ++p)
     {
-        (*p)->flushAsyncBatchRequests(outAsync);
+        (*p)->flushAsyncBatchRequests(outAsync, compress);
     }
 }
 
@@ -752,7 +831,15 @@ Ice::ObjectAdapterI::updateConnectionObservers()
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         f = _incomingConnectionFactories;
     }
+#ifdef ICE_CPP11_MAPPING
+    for_each(f.begin(), f.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->updateConnectionObservers();
+        });
+#else
     for_each(f.begin(), f.end(), Ice::voidMemFun(&IncomingConnectionFactory::updateConnectionObservers));
+#endif
 }
 
 void
@@ -835,14 +922,22 @@ Ice::ObjectAdapterI::getACM() const
     return _acm;
 }
 
+void
+Ice::ObjectAdapterI::setAdapterOnConnection(const Ice::ConnectionIPtr& connection)
+{
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+    checkForDeactivation();
+    connection->setAdapterAndServantManager(ICE_SHARED_FROM_THIS, _servantManager);
+}
+
 //
 // COMPILERFIX: The ObjectAdapterI setup is broken out into a separate initialize
 // function because when it was part of the constructor C++Builder 2010 apps would
-// crash if an execption was thrown from any calls within the constructor.
+// crash if an exception was thrown from any calls within the constructor.
 //
 Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const CommunicatorPtr& communicator,
                                     const ObjectAdapterFactoryPtr& objectAdapterFactory, const string& name,
-                                    /*const RouterPrx& router,*/ bool noConfig) :
+                                    /*const RouterPrxPtr& router,*/ bool noConfig) :
     _state(StateUninitialized),
     _instance(instance),
     _communicator(communicator),
@@ -856,7 +951,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
 }
 
 void
-Ice::ObjectAdapterI::initialize(const RouterPrx& router)
+Ice::ObjectAdapterI::initialize(const RouterPrxPtr& router)
 {
     if(_noConfig)
     {
@@ -889,9 +984,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
         //
         if(router == 0 && noProps)
         {
-            InitializationException ex(__FILE__, __LINE__);
-            ex.reason = "object adapter `" + _name + "' requires configuration";
-            throw ex;
+            throw InitializationException(__FILE__, __LINE__, "object adapter `" + _name + "' requires configuration");
         }
 
         const_cast<string&>(_id) = properties->getProperty(_name + ".AdapterId");
@@ -908,9 +1001,8 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
         }
         catch(const ProxyParseException&)
         {
-            InitializationException ex(__FILE__, __LINE__);
-            ex.reason = "invalid proxy options `" + proxyOptions + "' for object adapter `" + _name + "'";
-            throw ex;
+            throw InitializationException(__FILE__, __LINE__, "invalid proxy options `" + proxyOptions +
+                                          "' for object adapter `" + _name + "'");
         }
 
         const_cast<ACMConfig&>(_acm) =
@@ -944,47 +1036,35 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         if(!router)
         {
-            const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast(
-                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
+            const_cast<RouterPrxPtr&>(router) = ICE_UNCHECKED_CAST(RouterPrx,
+                                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
         }
         if(router)
         {
             _routerInfo = _instance->routerManager()->get(router);
-            if(_routerInfo)
-            {
-                //
-                // Make sure this router is not already registered with another adapter.
-                //
-                if(_routerInfo->getAdapter())
-                {
-                    throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter with router",
-                                                     _instance->identityToString(router->ice_getIdentity()));
-                }
+            assert(_routerInfo);
 
-                //
-                // Add the router's server proxy endpoints to this object
-                // adapter.
-                //
-                vector<EndpointIPtr> endpoints = _routerInfo->getServerEndpoints();
-                copy(endpoints.begin(), endpoints.end(), back_inserter(_routerEndpoints));
-                sort(_routerEndpoints.begin(), _routerEndpoints.end()); // Must be sorted.
-                _routerEndpoints.erase(unique(_routerEndpoints.begin(), _routerEndpoints.end()),
-                                       _routerEndpoints.end());
-
-                //
-                // Associate this object adapter with the router. This way,
-                // new outgoing connections to the router's client proxy will
-                // use this object adapter for callbacks.
-                //
-                _routerInfo->setAdapter(this);
-
-                //
-                // Also modify all existing outgoing connections to the
-                // router's client proxy to use this object adapter for
-                // callbacks.
-                //
-                _instance->outgoingConnectionFactory()->setRouterInfo(_routerInfo);
+            //
+            // Make sure this router is not already registered with another adapter.
+            //
+            if(_routerInfo->getAdapter())
+            {
+                throw AlreadyRegisteredException(__FILE__, __LINE__,
+                                                 "object adapter with router",
+                                                 _communicator->identityToString(router->ice_getIdentity()));
             }
+
+            //
+            // Associate this object adapter with the router. This way, new outgoing connections
+            // to the router's client proxy will use this object adapter for callbacks.
+            //
+            _routerInfo->setAdapter(ICE_SHARED_FROM_THIS);
+
+            //
+            // Also modify all existing outgoing connections to the router's client proxy to use
+            // this object adapter for callbacks.
+            //
+            _instance->outgoingConnectionFactory()->setRouterInfo(_routerInfo);
         }
         else
         {
@@ -996,11 +1076,19 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
             vector<EndpointIPtr> endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints"), true);
             for(vector<EndpointIPtr>::iterator p = endpoints.begin(); p != endpoints.end(); ++p)
             {
-                IncomingConnectionFactoryPtr factory = new IncomingConnectionFactory(_instance, *p, this);
-                 factory->initialize();
-                _incomingConnectionFactories.push_back(factory);
+                EndpointIPtr publishedEndpoint;
+                vector<EndpointIPtr> expanded = (*p)->expandHost(publishedEndpoint);
+                for(vector<EndpointIPtr>::iterator q = expanded.begin(); q != expanded.end(); ++q)
+                {
+                    IncomingConnectionFactoryPtr factory = ICE_MAKE_SHARED(IncomingConnectionFactory,
+                                                                           _instance,
+                                                                           *q,
+                                                                           publishedEndpoint,
+                                                                           ICE_SHARED_FROM_THIS);
+                    factory->initialize();
+                    _incomingConnectionFactories.push_back(factory);
+                }
             }
-
             if(endpoints.empty())
             {
                 TraceLevelsPtr tl = _instance->traceLevels();
@@ -1010,16 +1098,16 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                     out << "created adapter `" << _name << "' without endpoints";
                 }
             }
-
-            //
-            // Parse the published endpoints.
-            //
-            _publishedEndpoints = parsePublishedEndpoints();
         }
 
+        //
+        // Compute the published endpoints.
+        //
+        _publishedEndpoints = computePublishedEndpoints();
+
         if(!properties->getProperty(_name + ".Locator").empty())
         {
-            setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
+            setLocator(ICE_UNCHECKED_CAST(LocatorPrx, _instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
         }
         else
         {
@@ -1054,7 +1142,7 @@ Ice::ObjectAdapterI::~ObjectAdapterI()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 {
     if(_id.empty())
@@ -1071,26 +1159,17 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) const
 {
-    vector<EndpointIPtr> endpoints = _publishedEndpoints;
-
-    //
-    // Now we also add the endpoints of the router's server proxy, if
-    // any. This way, object references created by this object adapter
-    // will also point to the router's server proxy endpoints.
-    //
-    copy(_routerEndpoints.begin(), _routerEndpoints.end(), back_inserter(endpoints));
-
     //
     // Create a reference and return a proxy for this reference.
     //
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, facet, _reference, endpoints);
+    ReferencePtr ref = _instance->referenceFactory()->create(ident, facet, _reference, _publishedEndpoints);
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet, const string& id) const
 {
     //
@@ -1109,9 +1188,7 @@ Ice::ObjectAdapterI::checkForDeactivation() const
 {
     if(_state >= StateDeactivating)
     {
-        ObjectAdapterDeactivatedException ex(__FILE__, __LINE__);
-        ex.name = getName();
-        throw ex;
+        throw ObjectAdapterDeactivatedException(__FILE__, __LINE__, getName());
     }
 }
 
@@ -1129,6 +1206,10 @@ Ice::ObjectAdapterI::parseEndpoints(const string& endpts, bool oaEndpoints) cons
         beg = endpts.find_first_not_of(delim, end);
         if(beg == string::npos)
         {
+            if(!endpoints.empty())
+            {
+                throw EndpointParseException(__FILE__, __LINE__, "invalid empty object adapter endpoint");
+            }
             break;
         }
 
@@ -1177,17 +1258,14 @@ Ice::ObjectAdapterI::parseEndpoints(const string& endpts, bool oaEndpoints) cons
 
         if(end == beg)
         {
-            ++end;
-            continue;
+            throw EndpointParseException(__FILE__, __LINE__, "invalid empty object adapter endpoint");
         }
 
         string s = endpts.substr(beg, end - beg);
         EndpointIPtr endp = _instance->endpointFactoryManager()->create(s, oaEndpoints);
         if(endp == 0)
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid object adapter endpoint `" + s + "'";
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "invalid object adapter endpoint `" + s + "'");
         }
         endpoints.push_back(endp);
 
@@ -1198,25 +1276,54 @@ Ice::ObjectAdapterI::parseEndpoints(const string& endpts, bool oaEndpoints) cons
 }
 
 std::vector<EndpointIPtr>
-ObjectAdapterI::parsePublishedEndpoints()
+ObjectAdapterI::computePublishedEndpoints()
 {
-    //
-    // Parse published endpoints. If set, these are used in proxies
-    // instead of the connection factory endpoints.
-    //
-    string endpts = _communicator->getProperties()->getProperty(_name + ".PublishedEndpoints");
-    vector<EndpointIPtr> endpoints = parseEndpoints(endpts, false);
-    if(endpoints.empty())
+    vector<EndpointIPtr> endpoints;
+    if(_routerInfo)
+    {
+        //
+        // Get the router's server proxy endpoints and use them as the published endpoints.
+        //
+        vector<EndpointIPtr> endps = _routerInfo->getServerEndpoints();
+        for(vector<EndpointIPtr>::const_iterator p = endps.begin(); p != endps.end(); ++p)
+        {
+            if(::find(endpoints.begin(), endpoints.end(), *p) == endpoints.end())
+            {
+                endpoints.push_back(*p);
+            }
+        }
+    }
+    else
     {
         //
-        // If the PublishedEndpoints property isn't set, we compute the published enpdoints
-        // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY
-        // to include actual addresses in the published endpoints.
+        // Parse published endpoints. If set, these are used in proxies
+        // instead of the connection factory endpoints.
         //
-        for(unsigned int i = 0; i < _incomingConnectionFactories.size(); ++i)
+        string endpts = _communicator->getProperties()->getProperty(_name + ".PublishedEndpoints");
+        endpoints = parseEndpoints(endpts, false);
+        if(endpoints.empty())
         {
-            vector<EndpointIPtr> endps = _incomingConnectionFactories[i]->endpoint()->expand();
-            endpoints.insert(endpoints.end(), endps.begin(), endps.end());
+            //
+            // If the PublishedEndpoints property isn't set, we compute the published enpdoints
+            // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY
+            // to include actual addresses in the published endpoints.
+            //
+            for(unsigned int i = 0; i < _incomingConnectionFactories.size(); ++i)
+            {
+                vector<EndpointIPtr> endps = _incomingConnectionFactories[i]->endpoint()->expandIfWildcard();
+                for(vector<EndpointIPtr>::const_iterator p = endps.begin(); p != endps.end(); ++p)
+                {
+                    //
+                    // Check for duplicate endpoints, this might occur if an endpoint with a DNS name
+                    // expands to multiple addresses. In this case, multiple incoming connection
+                    // factories can point to the same published endpoint.
+                    //
+                    if(::find(endpoints.begin(), endpoints.end(), *p) == endpoints.end())
+                    {
+                        endpoints.push_back(*p);
+                    }
+                }
+            }
         }
     }
 
@@ -1238,14 +1345,14 @@ ObjectAdapterI::parsePublishedEndpoints()
 }
 
 void
-ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy)
+ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
 {
     if(_id.empty() || !locatorInfo)
     {
         return; // Nothing to update.
     }
 
-    LocatorRegistryPrx locatorRegistry = locatorInfo->getLocatorRegistry();
+    LocatorRegistryPrxPtr locatorRegistry = locatorInfo->getLocatorRegistry();
     if(!locatorRegistry)
     {
         return;
@@ -1271,10 +1378,7 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
             out << "the object adapter is not known to the locator registry";
         }
 
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "object adapter";
-        ex.id = _id;
-        throw ex;
+        throw NotRegisteredException(__FILE__, __LINE__, "object adapter", _id);
     }
     catch(const InvalidReplicaGroupIdException&)
     {
@@ -1285,10 +1389,7 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
             out << "the replica group `" << _replicaGroupId << "' is not known to the locator registry";
         }
 
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "replica group";
-        ex.id = _replicaGroupId;
-        throw ex;
+        throw NotRegisteredException(__FILE__, __LINE__, "replica group", _replicaGroupId);
     }
     catch(const AdapterAlreadyActiveException&)
     {
@@ -1299,9 +1400,7 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
             out << "the object adapter endpoints are already set";
         }
 
-        ObjectAdapterIdInUseException ex(__FILE__, __LINE__);
-        ex.id = _id;
-        throw ex;
+        throw ObjectAdapterIdInUseException(__FILE__, __LINE__, _id);
     }
     catch(const ObjectAdapterDeactivatedException&)
     {
@@ -1330,8 +1429,16 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
         {
             EndpointSeq endpts = proxy ? proxy->ice_getEndpoints() : EndpointSeq();
             ostringstream o;
+#ifdef ICE_CPP11_COMPILER
+            transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""),
+                      [](const EndpointPtr& endpoint)
+                      {
+                          return endpoint->toString();
+                      });
+#else
             transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""),
                       Ice::constMemFun(&Endpoint::toString));
+#endif
             out << o.str();
         }
     }