IcePatch improvements; Ice.PrintAdapterReady timing fix

1 files changed, 11 insertions, 5 deletions

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 0ec2ddfe363..789e60d1c18 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -56,6 +56,16 @@ Ice::ObjectAdapterI::activate()
 
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
 	     Ice::voidMemFun(&IncomingConnectionFactory::activate));
+
+    if (!_printAdapterReadyDone)
+    {
+	if (atoi(_instance->properties()->getProperty("Ice.PrintAdapterReady").c_str()) > 0)
+	{
+	    cout << _name << " ready" << endl;
+	}
+
+	_printAdapterReadyDone = true;
+    }
 }
 
 void
@@ -363,6 +373,7 @@ Ice::ObjectAdapterI::getIncomingConnections() const
 Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& name, const string& endpts) :
     _instance(instance),
     _deactivated(false),
+    _printAdapterReadyDone(false),
     _name(name),
     _activeServantMapHint(_activeServantMap.end()),
     _locatorMapHint(_locatorMap.end())
@@ -432,11 +443,6 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& n
 	throw EndpointParseException(__FILE__, __LINE__);
     }
 */
-
-    if (atoi(_instance->properties()->getProperty("Ice.PrintAdapterReady").c_str()) > 0)
-    {
-	cout << _name << " ready" << endl;
-    }
 }
 
 Ice::ObjectAdapterI::~ObjectAdapterI()