zeroc-ice 3.7.0 → 3.7.1

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -151,16 +151,6 @@ enum SocketOperation
 #endif
 };
 
-//
-// On UWP, wait only for read to return, on IOCP/Win32 wait for
-// both pending read and write operations to complete (#ICE-6695).
-//
-#if defined(ICE_OS_UWP)
-const int SocketOperationWaitForClose = 1;
-#elif defined(ICE_USE_IOCP)
-const int SocketOperationWaitForClose = 3;
-#endif
-
 //
 // AsyncInfo struct for Windows IOCP or UWP holds the result of
 // asynchronous operations after it completed.
@@ -180,6 +170,7 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED
 struct ICE_API AsyncInfo
 {
     Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ completedHandler;
+    Windows::Foundation::IAsyncInfo^ operation;
     int count;
     int error;
 };
@@ -250,7 +241,7 @@ protected:
     HANDLE _handle;
     ULONG_PTR _key;
 #elif defined(ICE_OS_UWP)
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, bool = false);
+    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, Windows::Foundation::AsyncStatus, bool = false);
     SocketOperationCompletedHandler^ _completedHandler;
 #else
     SOCKET _newFd;

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -250,6 +250,11 @@ Ice::Object::_iceDispatch(Incoming& in, const Current& current)
 }
 
 #ifndef ICE_CPP11_MAPPING
+void
+Ice::Object::ice_collectable(bool)
+{
+}
+
 void
 Ice::Object::ice_preMarshal()
 {
@@ -334,14 +339,12 @@ Ice::Object::_iceCheckMode(OperationMode expected, OperationMode received)
         }
         else
         {
-            Ice::MarshalException ex(__FILE__, __LINE__);
             std::ostringstream reason;
             reason << "unexpected operation mode. expected = "
                    << operationModeToString(expected)
                    << " received = "
                    << operationModeToString(received);
-            ex.reason = reason.str();
-            throw ex;
+            throw Ice::MarshalException(__FILE__, __LINE__, reason.str());
         }
     }
 }

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -46,7 +46,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -73,7 +73,9 @@ Ice::ObjectAdapter::~ObjectAdapter()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectAdapter* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ObjectAdapter* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -41,8 +41,8 @@ IceInternal::ObjectAdapterFactory::shutdown()
 
         adapters = _adapters;
 
-        _instance = 0;
-        _communicator = 0;
+        _instance = ICE_NULLPTR;
+        _communicator = ICE_NULLPTR;
 
         notifyAll();
     }
@@ -147,32 +147,66 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
 ObjectAdapterPtr
 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 = Ice::generateUUID();
-        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
-        adapter->initialize(ICE_NULLPTR);
+        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 = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_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;
 }
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -72,7 +72,7 @@ inline EndpointIPtr toEndpointI(const EndpointPtr& endp)
 }
 
 string
-Ice::ObjectAdapterI::getName() const
+Ice::ObjectAdapterI::getName() const ICE_NOEXCEPT
 {
     //
     // No mutex lock necessary, _name is immutable.
@@ -81,7 +81,7 @@ Ice::ObjectAdapterI::getName() const
 }
 
 CommunicatorPtr
-Ice::ObjectAdapterI::getCommunicator() const
+Ice::ObjectAdapterI::getCommunicator() const ICE_NOEXCEPT
 {
     return _communicator;
 }
@@ -224,7 +224,7 @@ Ice::ObjectAdapterI::waitForHold()
 }
 
 void
-Ice::ObjectAdapterI::deactivate()
+Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT
 {
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -249,21 +249,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&)
@@ -274,11 +274,6 @@ 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)
@@ -290,11 +285,6 @@ Ice::ObjectAdapterI::deactivate()
              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(ICE_SHARED_FROM_THIS);
 
     {
@@ -306,7 +296,7 @@ Ice::ObjectAdapterI::deactivate()
 }
 
 void
-Ice::ObjectAdapterI::waitForDeactivate()
+Ice::ObjectAdapterI::waitForDeactivate() ICE_NOEXCEPT
 {
     vector<IceInternal::IncomingConnectionFactoryPtr> incomingConnectionFactories;
 
@@ -345,7 +335,7 @@ Ice::ObjectAdapterI::waitForDeactivate()
 }
 
 bool
-Ice::ObjectAdapterI::isDeactivated() const
+Ice::ObjectAdapterI::isDeactivated() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -415,7 +405,6 @@ Ice::ObjectAdapterI::destroy() ICE_NOEXCEPT
         //
         _instance = 0;
         _threadPool = 0;
-        _routerEndpoints.clear();
         _routerInfo = 0;
         _publishedEndpoints.clear();
         _locatorInfo = 0;
@@ -633,7 +622,7 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrxPtr& locator)
 }
 
 LocatorPrxPtr
-Ice::ObjectAdapterI::getLocator() const
+Ice::ObjectAdapterI::getLocator() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -648,7 +637,7 @@ Ice::ObjectAdapterI::getLocator() const
 }
 
 EndpointSeq
-Ice::ObjectAdapterI::getEndpoints() const
+Ice::ObjectAdapterI::getEndpoints() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -677,7 +666,7 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
         checkForDeactivation();
 
         oldPublishedEndpoints = _publishedEndpoints;
-        _publishedEndpoints = parsePublishedEndpoints();
+        _publishedEndpoints = computePublishedEndpoints();
 
         locatorInfo = _locatorInfo;
     }
@@ -701,29 +690,34 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints()
 }
 
 EndpointSeq
-Ice::ObjectAdapterI::getPublishedEndpoints() const
+Ice::ObjectAdapterI::getPublishedEndpoints() const ICE_NOEXCEPT
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
-    EndpointSeq endpoints;
-    copy(_publishedEndpoints.begin(), _publishedEndpoints.end(), back_inserter(endpoints));
-    return endpoints;
+    return EndpointSeq(_publishedEndpoints.begin(), _publishedEndpoints.end());
 }
 
 void
 Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints)
 {
-    vector<EndpointIPtr> newPublishedEndpoints;
-    transform(newEndpoints.begin(), newEndpoints.end(), back_inserter(newPublishedEndpoints), toEndpointI);
-
     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 = newPublishedEndpoints;
+        _publishedEndpoints.clear();
+        transform(newEndpoints.begin(), newEndpoints.end(), back_inserter(_publishedEndpoints), toEndpointI);
 
         locatorInfo = _locatorInfo;
     }
@@ -802,25 +796,6 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& 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;
@@ -940,6 +915,14 @@ 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
@@ -994,9 +977,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrxPtr& 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");
@@ -1013,9 +994,8 @@ Ice::ObjectAdapterI::initialize(const RouterPrxPtr& 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) =
@@ -1055,42 +1035,29 @@ Ice::ObjectAdapterI::initialize(const RouterPrxPtr& 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",
-                                                     _communicator->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(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);
+            //
+            // 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
         {
@@ -1124,13 +1091,13 @@ Ice::ObjectAdapterI::initialize(const RouterPrxPtr& 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(ICE_UNCHECKED_CAST(LocatorPrx, _instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
@@ -1188,19 +1155,10 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 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);
 }
 
@@ -1223,9 +1181,7 @@ Ice::ObjectAdapterI::checkForDeactivation() const
 {
     if(_state >= StateDeactivating)
     {
-        ObjectAdapterDeactivatedException ex(__FILE__, __LINE__);
-        ex.name = getName();
-        throw ex;
+        throw ObjectAdapterDeactivatedException(__FILE__, __LINE__, getName());
     }
 }
 
@@ -1313,34 +1269,52 @@ 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)
     {
         //
-        // 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.
+        // Get the router's server proxy endpoints and use them as the published endpoints.
         //
-        for(unsigned int i = 0; i < _incomingConnectionFactories.size(); ++i)
+        vector<EndpointIPtr> endps = _routerInfo->getServerEndpoints();
+        for(vector<EndpointIPtr>::const_iterator p = endps.begin(); p != endps.end(); ++p)
         {
-            vector<EndpointIPtr> endps = _incomingConnectionFactories[i]->endpoint()->expandIfWildcard();
-            for(vector<EndpointIPtr>::const_iterator p = endps.begin(); p != endps.end(); ++p)
+            if(::find(endpoints.begin(), endpoints.end(), *p) == endpoints.end())
             {
-                //
-                // 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);
+            }
+        }
+    }
+    else
+    {
+        //
+        // Parse published endpoints. If set, these are used in proxies
+        // instead of the connection factory endpoints.
+        //
+        string endpts = _communicator->getProperties()->getProperty(_name + ".PublishedEndpoints");
+        endpoints = parseEndpoints(endpts, false);
+        if(endpoints.empty())
+        {
+            //
+            // 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)
                 {
-                    endpoints.push_back(*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);
+                    }
                 }
             }
         }
@@ -1397,10 +1371,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&)
     {
@@ -1411,10 +1382,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&)
     {
@@ -1425,9 +1393,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&)
     {