diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rwxr-xr-x | cpp/src/Ice/ConnectionFactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 3759ca19abe..2869d610748 100755 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -206,7 +206,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt } catch(const Ice::LocalException& ex) { - exception.reset(dynamic_cast<Ice::LocalException*>(ex.ice_clone())); + exception.reset(ex.ice_clone()); handleException(ex, hasMore || p != endpoints.end() - 1); } } @@ -276,7 +276,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt observer->failed(ex.ice_name()); observer->detach(); } - exception.reset(dynamic_cast<Ice::LocalException*>(ex.ice_clone())); + exception.reset(ex.ice_clone()); handleConnectionException(*exception.get(), hasMore || q != connectors.end() - 1); connection = 0; break; // No need to continue @@ -288,7 +288,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt observer->failed(ex.ice_name()); observer->detach(); } - exception.reset(dynamic_cast<Ice::LocalException*>(ex.ice_clone())); + exception.reset(ex.ice_clone()); handleConnectionException(*exception.get(), hasMore || q != connectors.end() - 1); connection = 0; } |