zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,25 +23,60 @@
 #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
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
+Ice::ObjectAdapter::~ObjectAdapter()
+{
+}
+
+#else // C++98 mapping
+
 namespace
 {
 
 }
 
+Ice::ObjectAdapter::~ObjectAdapter()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectAdapter* p) { return p; }
+
+namespace Ice
+{
+}
+
+#endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,22 +23,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
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       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,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -12,13 +12,15 @@
 #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()
@@ -49,7 +51,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 +80,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 +113,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,12 +133,19 @@ 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);
 
@@ -137,9 +157,9 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
     ObjectAdapterIPtr adapter;
     if(name.empty())
     {
-        string uuid = IceUtil::generateUUID();
-        adapter = new ObjectAdapterI(_instance, _communicator, this, uuid, true);
-        adapter->initialize(0);
+        string uuid = Ice::generateUUID();
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
+        adapter->initialize(ICE_NULLPTR);
     }
     else
     {
@@ -147,7 +167,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
         {
             throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
         }
-        adapter = new ObjectAdapterI(_instance, _communicator, this, name, false);
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
         adapter->initialize(router);
         _adapterNamesInUse.insert(name);
     }
@@ -157,7 +177,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
+IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrxPtr& proxy)
 {
     list<ObjectAdapterIPtr> adapters;
     {
@@ -165,7 +185,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
 
         if(!_instance)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         adapters = _adapters;
@@ -186,7 +206,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
         }
     }
 
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
@@ -211,7 +231,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 +243,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,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -19,7 +19,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 +35,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/{include → src}/Ice/ObjectAdapterFactoryF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -18,8 +18,12 @@ 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
 
 }
 

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

@@ -1,14 +1,15 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-#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 +32,7 @@
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/PropertyNames.h>
+#include <Ice/ConsoleUtil.h>
 
 #ifdef _WIN32
 #   include <sys/timeb.h>
@@ -61,6 +63,12 @@ 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
@@ -95,8 +103,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 +157,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 +187,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,8 +211,16 @@ 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
@@ -240,15 +279,23 @@ Ice::ObjectAdapterI::deactivate()
     // 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);
@@ -285,8 +332,16 @@ 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
@@ -298,7 +353,7 @@ Ice::ObjectAdapterI::isDeactivated() const
 }
 
 void
-Ice::ObjectAdapterI::destroy()
+Ice::ObjectAdapterI::destroy() ICE_NOEXCEPT
 {
     //
     // Deactivate and wait for completion.
@@ -343,7 +398,7 @@ Ice::ObjectAdapterI::destroy()
 
     if(_objectAdapterFactory)
     {
-        _objectAdapterFactory->removeObjectAdapter(this);
+        _objectAdapterFactory->removeObjectAdapter(ICE_SHARED_FROM_THIS);
     }
 
     {
@@ -372,13 +427,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 +447,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 +539,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 +589,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 +600,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 +611,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 +623,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,7 +632,7 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
     _locatorInfo = _instance->locatorManager()->get(locator);
 }
 
-LocatorPrx
+LocatorPrxPtr
 Ice::ObjectAdapterI::getLocator() const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -592,6 +647,24 @@ Ice::ObjectAdapterI::getLocator() const
     }
 }
 
+EndpointSeq
+Ice::ObjectAdapterI::getEndpoints() const
+{
+    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,7 +674,6 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
         checkForDeactivation();
 
         oldPublishedEndpoints = _publishedEndpoints;
@@ -629,35 +701,60 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
 }
 
 EndpointSeq
-Ice::ObjectAdapterI::getEndpoints() const
+Ice::ObjectAdapterI::getPublishedEndpoints() const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
     EndpointSeq endpoints;
-    transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
-              back_inserter(endpoints), Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+    copy(_publishedEndpoints.begin(), _publishedEndpoints.end(), back_inserter(endpoints));
     return endpoints;
 }
 
-EndpointSeq
-Ice::ObjectAdapterI::getPublishedEndpoints() const
+void
+Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints)
 {
-    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+    vector<EndpointIPtr> newPublishedEndpoints;
+    transform(newEndpoints.begin(), newEndpoints.end(), back_inserter(newPublishedEndpoints), toEndpointI);
 
-    EndpointSeq endpoints;
-    copy(_publishedEndpoints.begin(), _publishedEndpoints.end(), back_inserter(endpoints));
-    return endpoints;
+    LocatorInfoPtr locatorInfo;
+    vector<EndpointIPtr> oldPublishedEndpoints;
+    {
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+        checkForDeactivation();
+
+        oldPublishedEndpoints = _publishedEndpoints;
+        _publishedEndpoints = newPublishedEndpoints;
+
+        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;
+    }
 }
 
 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 +787,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;
                 }
@@ -730,7 +827,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
 }
 
 void
-Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
+Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync, CompressBatch compress)
 {
     vector<IncomingConnectionFactoryPtr> f;
     {
@@ -740,7 +837,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 +849,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
@@ -842,7 +947,7 @@ Ice::ObjectAdapterI::getACM() const
 //
 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 +961,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
 }
 
 void
-Ice::ObjectAdapterI::initialize(const RouterPrx& router)
+Ice::ObjectAdapterI::initialize(const RouterPrxPtr& router)
 {
     if(_noConfig)
     {
@@ -944,8 +1049,8 @@ 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)
         {
@@ -957,8 +1062,9 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                 //
                 if(_routerInfo->getAdapter())
                 {
-                    throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter with router",
-                                                     _instance->identityToString(router->ice_getIdentity()));
+                    throw AlreadyRegisteredException(__FILE__, __LINE__,
+                                                     "object adapter with router",
+                                                     _communicator->identityToString(router->ice_getIdentity()));
                 }
 
                 //
@@ -976,7 +1082,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                 // new outgoing connections to the router's client proxy will
                 // use this object adapter for callbacks.
                 //
-                _routerInfo->setAdapter(this);
+                _routerInfo->setAdapter(ICE_SHARED_FROM_THIS);
 
                 //
                 // Also modify all existing outgoing connections to the
@@ -996,11 +1102,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();
@@ -1019,7 +1133,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         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 +1168,7 @@ Ice::ObjectAdapterI::~ObjectAdapterI()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 {
     if(_id.empty())
@@ -1071,7 +1185,7 @@ 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;
@@ -1090,7 +1204,7 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet)
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet, const string& id) const
 {
     //
@@ -1129,6 +1243,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 +1295,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);
 
@@ -1215,8 +1330,19 @@ ObjectAdapterI::parsePublishedEndpoints()
         //
         for(unsigned int i = 0; i < _incomingConnectionFactories.size(); ++i)
         {
-            vector<EndpointIPtr> endps = _incomingConnectionFactories[i]->endpoint()->expand();
-            endpoints.insert(endpoints.end(), endps.begin(), endps.end());
+            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 +1364,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;