Expanded tabs into spaces

1 files changed, 70 insertions, 70 deletions

diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index abf97e7ed12..52a63bb3de1 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -17,10 +17,10 @@ using namespace std;
 using namespace IceGrid;
 
 ServerAdapterI::ServerAdapterI(const NodeIPtr& node,
-			       ServerI* server, 
-			       const string& serverName,
-			       const AdapterPrx& proxy,
-			       const string& id) :
+                               ServerI* server, 
+                               const string& serverName,
+                               const AdapterPrx& proxy,
+                               const string& id) :
     _node(node),
     _this(proxy),
     _serverId(serverName),
@@ -37,39 +37,39 @@ void
 ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current& current)
 {
     {
-	Lock sync(*this);
-	if(_proxy)
-	{
-	    //
-	    // Return the adapter direct proxy.
-	    //
-	    cb->ice_response(_proxy);
-	    return;
-	}
-	else if(_activateCB.empty())
-	{
-	    //
-	    // Nothing else waits for this adapter so we must make sure that this 
-	    // adapter if still activatable.
-	    //
-	    if(!_server->isAdapterActivatable(_id))
-	    {
-		cb->ice_response(0);
-		return;
-	    }
-	}
-
-	if(_node->getTraceLevels()->adapter > 2)
-	{
-	    Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
-	    out << "waiting for activation of server `" + _serverId + "' adapter `" << _id << "'";
-	}
-
-	_activateCB.push_back(cb);
-	if(_activateCB.size() > 1)
-	{
-	    return;
-	}
+        Lock sync(*this);
+        if(_proxy)
+        {
+            //
+            // Return the adapter direct proxy.
+            //
+            cb->ice_response(_proxy);
+            return;
+        }
+        else if(_activateCB.empty())
+        {
+            //
+            // Nothing else waits for this adapter so we must make sure that this 
+            // adapter if still activatable.
+            //
+            if(!_server->isAdapterActivatable(_id))
+            {
+                cb->ice_response(0);
+                return;
+            }
+        }
+
+        if(_node->getTraceLevels()->adapter > 2)
+        {
+            Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
+            out << "waiting for activation of server `" + _serverId + "' adapter `" << _id << "'";
+        }
+
+        _activateCB.push_back(cb);
+        if(_activateCB.size() > 1)
+        {
+            return;
+        }
     }
 
     //
@@ -79,21 +79,21 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur
     //
     try
     {
-	_server->start(ServerI::OnDemand);
-	return;
+        _server->start(ServerI::OnDemand);
+        return;
     }
     catch(const ServerStartException& ex)
     {
-	activationFailed(ex.reason);
+        activationFailed(ex.reason);
     }
     catch(const Ice::ObjectNotExistException&)
     {
-	//
-	// The server associated to this adapter doesn't exist anymore. Somehow the database is 
-	// inconsistent if this happens. The best thing to do is to destroy the adapter.
-	//
-	destroy();
-	activationFailed("server destroyed");
+        //
+        // The server associated to this adapter doesn't exist anymore. Somehow the database is 
+        // inconsistent if this happens. The best thing to do is to destroy the adapter.
+        //
+        destroy();
+        activationFailed("server destroyed");
     }
 }
 
@@ -108,13 +108,13 @@ ServerAdapterI::getDirectProxy(const Ice::Current& current) const
     //
     if(_proxy)
     {
-	return _proxy;
+        return _proxy;
     }
     else
     {
-	AdapterNotActiveException ex;
-	ex.activatable = _server->isAdapterActivatable(_id);
-	throw ex;
+        AdapterNotActiveException ex;
+        ex.activatable = _server->isAdapterActivatable(_id);
+        throw ex;
     }
 }
 
@@ -129,10 +129,10 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&)
     //
     if(prx && _proxy)
     {
-	if(_server->getState() == Active)
-	{
-	    throw AdapterActiveException();
-	}
+        if(_server->getState() == Active)
+        {
+            throw AdapterActiveException();
+        }
     }
 
     bool updated = _proxy != prx;
@@ -140,35 +140,35 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&)
 
     for(vector<AMD_Adapter_activatePtr>::const_iterator p = _activateCB.begin(); p != _activateCB.end(); ++p)
     {
-	(*p)->ice_response(_proxy);
+        (*p)->ice_response(_proxy);
     }
     _activateCB.clear();
 
     if(updated)
     {
-	AdapterDynamicInfo info;
-	info.id = _id;
-	info.proxy = _proxy;
-	_node->observerUpdateAdapter(info);
+        AdapterDynamicInfo info;
+        info.id = _id;
+        info.proxy = _proxy;
+        _node->observerUpdateAdapter(info);
     }
 
     if(_proxy)
     {
-	_server->adapterActivated(_id);
+        _server->adapterActivated(_id);
     }
     else
     {
-	_server->adapterDeactivated(_id);
+        _server->adapterDeactivated(_id);
     }
 
     if(_node->getTraceLevels()->adapter > 1)
     {
-	Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
-	out << "server `" + _serverId + "' adapter `" << _id << "' " << (_proxy ? "activated" : "deactivated");
-	if(_proxy)
-	{
-	    out << ": " << _node->getCommunicator()->proxyToString(_proxy);
-	}
+        Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
+        out << "server `" + _serverId + "' adapter `" << _id << "' " << (_proxy ? "activated" : "deactivated");
+        if(_proxy)
+        {
+            out << ": " << _node->getCommunicator()->proxyToString(_proxy);
+        }
     }
 }
 
@@ -194,14 +194,14 @@ ServerAdapterI::activationFailed(const std::string& reason)
     //
     if(_node->getTraceLevels()->adapter > 1)
     {
-	Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
-	out << "server `" + _serverId + "' adapter `" << _id << "' activation failed: " << reason;
+        Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->adapterCat);
+        out << "server `" + _serverId + "' adapter `" << _id << "' activation failed: " << reason;
     }
 
     Lock sync(*this);
     for(vector<AMD_Adapter_activatePtr>::const_iterator p = _activateCB.begin(); p != _activateCB.end(); ++p)
     {
-	(*p)->ice_response(0);
+        (*p)->ice_response(0);
     }
     _activateCB.clear();
 }