diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-30 04:58:01 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-30 04:58:01 +0000 |
| commit | a795900d002f4182b13b32f6ebf3391458786123 (patch) | |
| tree | 3a75ed09a7ce57e0253f54ee6f0cbcf08dfba3ac /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Bug 498. (diff) | |
| download | ice-a795900d002f4182b13b32f6ebf3391458786123.tar.bz2 ice-a795900d002f4182b13b32f6ebf3391458786123.tar.xz ice-a795900d002f4182b13b32f6ebf3391458786123.zip | |
Added support for <adapter name>.ReplicaId.
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index f93798db82d..8178308852b 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -21,11 +21,13 @@ ServerAdapterI::ServerAdapterI(const NodeIPtr& node, const string& serverName, const AdapterPrx& proxy, const string& id, + const string& replicaId, Ice::Int waitTime) : _node(node), _this(proxy), _serverId(serverName), _id(id), + _replicaId(id), _server(server), _waitTime(IceUtil::Time::seconds(waitTime)) { @@ -84,7 +86,7 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur destroy(current); } - activationFailed(false); + activationFailed(_server->getState() == IceGrid::Activating); } Ice::ObjectPrx |