diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-09-20 13:12:50 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-09-20 13:12:50 +0000 |
| commit | d99db9620ba052e79cd5bd40c75306f600f9c48c (patch) | |
| tree | 8b5bf4d7b52f1e60469cb48e6b466e7f4b08c41f /cpp/src/Ice/Connection.cpp | |
| parent | minor (diff) | |
| download | ice-d99db9620ba052e79cd5bd40c75306f600f9c48c.tar.bz2 ice-d99db9620ba052e79cd5bd40c75306f600f9c48c.tar.xz ice-d99db9620ba052e79cd5bd40c75306f600f9c48c.zip | |
Runtime->Local
Diffstat (limited to 'cpp/src/Ice/Connection.cpp')
| -rw-r--r-- | cpp/src/Ice/Connection.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index adb6a729d20..a48b9649f4a 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -20,7 +20,7 @@ #include <Ice/Endpoint.h> #include <Ice/Outgoing.h> #include <Ice/Incoming.h> -#include <Ice/RuntimeException.h> +#include <Ice/LocalException.h> #include <Ice/Protocol.h> #include <bzlib.h> @@ -168,7 +168,7 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool comp) _transceiver->write(*os, _endpoint->timeout()); } } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); assert(_exception.get()); @@ -316,7 +316,7 @@ IceInternal::Connection::flushBatchRequest(bool comp) _batchStream.swap(dummy); assert(_batchStream.b.empty()); } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); assert(_exception.get()); @@ -612,7 +612,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa } } } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); return; @@ -656,7 +656,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa { in.invoke(response); } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { IceUtil::RecMutex::Lock sync(*this); if(_warn) @@ -686,7 +686,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa } while(batch && is->i < is->b.end()); } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { IceUtil::RecMutex::Lock sync(*this); setState(StateClosed, ex); @@ -763,7 +763,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa closeConnection(); } } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); return; @@ -790,7 +790,7 @@ IceInternal::Connection::finished(const ThreadPoolPtr& threadPool) } void -IceInternal::Connection::exception(const RuntimeException& ex) +IceInternal::Connection::exception(const LocalException& ex) { IceUtil::RecMutex::Lock sync(*this); setState(StateClosed, ex); @@ -841,7 +841,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance, { validateConnection(); } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { if(_warn) { @@ -894,7 +894,7 @@ IceInternal::Connection::destroy(DestructionReason reason) } void -IceInternal::Connection::setState(State state, const RuntimeException& ex) +IceInternal::Connection::setState(State state, const LocalException& ex) { if(_state == state) // Don't switch twice. { @@ -919,11 +919,11 @@ IceInternal::Connection::setState(State state, const RuntimeException& ex) // connection loss without receiving an explicit close // connection message first. // - _exception = auto_ptr<RuntimeException>(new CloseConnectionException(__FILE__, __LINE__)); + _exception = auto_ptr<LocalException>(new CloseConnectionException(__FILE__, __LINE__)); } else { - _exception = auto_ptr<RuntimeException>(dynamic_cast<RuntimeException*>(ex.ice_clone())); + _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); } if(_warn) @@ -1031,7 +1031,7 @@ IceInternal::Connection::setState(State state) { closeConnection(); } - catch(const RuntimeException& ex) + catch(const LocalException& ex) { setState(StateClosed, ex); } |