diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-11-20 12:02:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-11-20 12:02:35 +0100 |
| commit | a021dbce94296f83bc5feb25a2aa99461bab057d (patch) | |
| tree | 648a3b5632d7e80006345540f0e2c1a1ddb266fe /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
| download | ice-a021dbce94296f83bc5feb25a2aa99461bab057d.tar.bz2 ice-a021dbce94296f83bc5feb25a2aa99461bab057d.tar.xz ice-a021dbce94296f83bc5feb25a2aa99461bab057d.zip | |
Fixed bug 2235, other minor fixes
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index b6835e6d90f..4529bf4e8d8 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -128,16 +128,16 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&) // We don't allow to override an existing proxy by another non // null proxy if the server is not inactive. // - // TODO: This check would fail with the new refreshPublishedEndpoints() call. - // Is some protesction still needed though? - // - //if(prx && _proxy) - //{ - // if(_server->getState() == Active) - // { - // throw AdapterActiveException(); - // } - //} + if(!_node->allowEndpointsOverride()) + { + if(prx && _proxy) + { + if(_server->getState() == Active) + { + throw AdapterActiveException(); + } + } + } bool updated = _proxy != prx; _proxy = prx; |