diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-07-20 20:17:51 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-07-20 20:17:51 +0000 |
| commit | 55363a13e1c750b39db419c5312217b9256f1fec (patch) | |
| tree | 76aa0e305ccd7a3db64e7e03703f74e2dadb0c34 /cpp/src/IceGrid/AdapterCache.cpp | |
| parent | file Communicator.cpp was initially added on branch R3_1_branch. (diff) | |
| download | ice-55363a13e1c750b39db419c5312217b9256f1fec.tar.bz2 ice-55363a13e1c750b39db419c5312217b9256f1fec.tar.xz ice-55363a13e1c750b39db419c5312217b9256f1fec.zip | |
Merge from R3_1_branch
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index 04b763f3527..583ac2663fc 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -398,7 +398,6 @@ ReplicaGroupEntry::getProxies(int& nReplicas, bool& replicaGroup) // reachable. // vector<pair<string, AdapterPrx> > adapters; - auto_ptr<Ice::Exception> exception; for(ReplicaSeq::const_iterator p = replicas.begin(); p != replicas.end(); ++p) { try @@ -411,20 +410,11 @@ ReplicaGroupEntry::getProxies(int& nReplicas, bool& replicaGroup) catch(const Ice::InvalidReplicaGroupIdException&) { } - catch(const Ice::Exception& ex) + catch(const NodeUnreachableException&) { - if(!exception.get()) - { - exception.reset(ex.ice_clone()); - } } } - if(exception.get()) - { - exception->ice_throw(); - } - return adapters; } |