diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-09-04 19:23:32 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-09-04 19:23:32 +0000 |
| commit | bdeb0007e50f676bf416ca25c493c888548ea7cd (patch) | |
| tree | f7f25ecd302b273e31d80a420e5667b40900a267 /cpp/src/IcePack/ServerAdapterI.cpp | |
| parent | Temporary fix to use binary freeze db (diff) | |
| download | ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.tar.bz2 ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.tar.xz ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.zip | |
Added local exceptions ObjectAdapterActiveException and
ObjectAdapterNotRegisteredException.
:LocatoRegistry::addAdapter method to setAdapterDirectProxy.
Minor IcePack fixes.
Diffstat (limited to 'cpp/src/IcePack/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IcePack/ServerAdapterI.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp index 5121a6881c6..cbf747f5d8a 100644 --- a/cpp/src/IcePack/ServerAdapterI.cpp +++ b/cpp/src/IcePack/ServerAdapterI.cpp @@ -99,7 +99,10 @@ IcePack::ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Cu // null. We don't allow to overide an existing proxy by another // non null proxy. // - assert(!(prx && _proxy)); + if(prx && _proxy) + { + throw AdapterActiveException(); + } _proxy = prx; _notified = true; |