diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
| commit | fed698d7a15486e1c01ee4e7eafe3da45d7cd803 (patch) | |
| tree | 5013a1127805e438bc76dc8f4b2f49a1c2461fea /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Fix (diff) | |
| download | ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.bz2 ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.xz ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.zip | |
Improved the error message if you try to remove an object or adapter with
the admin interface and if that object or adapter was added with a
deployment descriptor.
Fixed a bug where trying to start a server managed by a node would fail if
this server was previously manually activated.
Simplified adapter direct proxy update if the adapter is an adapter that
wasn't added with a deployment descriptor.
Fixes to allow compilation on AIX.
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index 1e7fd72dc20..9686f3faa84 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -111,13 +111,13 @@ ServerAdapterI::getDirectProxy(const Ice::Current& current) const } void -ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current& current) +ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&) { Lock sync(*this); // - // If the adapter proxy is not null the given proxy can only be null. We don't allow to overide an - // existing proxy by another non null proxy if the server is active. + // We don't allow to override an existing proxy by another non + // null proxy if the server is not inactive. // if(prx && _proxy) { @@ -147,7 +147,7 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current& cu info.proxy = _proxy; try { - observer->updateAdapter(_node->getName(current), info); + observer->updateAdapter(_node->getName(), info); } catch(const Ice::LocalException&) { |