diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-04 15:53:35 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-04 15:53:35 +0000 |
| commit | 512d5d6ee8737edc9dbc82773532ae9a54a7cfcd (patch) | |
| tree | af479386298a1914edec879859341e507d0e7326 /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Bug 1597. (diff) | |
| download | ice-512d5d6ee8737edc9dbc82773532ae9a54a7cfcd.tar.bz2 ice-512d5d6ee8737edc9dbc82773532ae9a54a7cfcd.tar.xz ice-512d5d6ee8737edc9dbc82773532ae9a54a7cfcd.zip | |
Bug 1658 - listen on 0.0.0.0 rather than expanding endpoints
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index 52a63bb3de1..85023b27a3d 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -127,13 +127,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. // - if(prx && _proxy) - { - if(_server->getState() == Active) - { - throw AdapterActiveException(); - } - } + // 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(); + // } + //} bool updated = _proxy != prx; _proxy = prx; |