diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-20 09:16:56 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-20 09:16:56 -0500 |
| commit | 470bb86bfbd42b20758cdc64a80393e2aac64749 (patch) | |
| tree | b24232d1df8a3efb6882ed80f20b32cb0a325cdc /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Missing Windows makefile (diff) | |
| parent | Removed makprops.py from remove files list (diff) | |
| download | ice-470bb86bfbd42b20758cdc64a80393e2aac64749.tar.bz2 ice-470bb86bfbd42b20758cdc64a80393e2aac64749.tar.xz ice-470bb86bfbd42b20758cdc64a80393e2aac64749.zip | |
Merge branch 'master' of cvs:/home/git/ice
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; |