diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-06 20:23:28 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-06 20:23:28 +0000 |
| commit | fb1f5c770c551fe526adf5b860dd72cf5eb07311 (patch) | |
| tree | 79a0d3ccb278e51b9ec5213b038b903d768c2727 /cpp/src/qpid/client/ConnectionImpl.h | |
| parent | 76c922baf182bb367feed2ec014e7cab9db7f79d (diff) | |
| download | qpid-python-fb1f5c770c551fe526adf5b860dd72cf5eb07311.tar.gz | |
Added exceptions to sys::Waitable.
Fixed client side deadlock involving client::Bounds.
Fixed incorrect exception messages during connection shutdown.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@664114 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/ConnectionImpl.h')
| -rw-r--r-- | cpp/src/qpid/client/ConnectionImpl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/cpp/src/qpid/client/ConnectionImpl.h index 655bca359b..089e73335d 100644 --- a/cpp/src/qpid/client/ConnectionImpl.h +++ b/cpp/src/qpid/client/ConnectionImpl.h @@ -49,7 +49,6 @@ class ConnectionImpl : public Bounds, { typedef std::map<uint16_t, boost::weak_ptr<SessionImpl> > SessionMap; - typedef std::vector<boost::shared_ptr<SessionImpl> > SessionVector; SessionMap sessions; ConnectionHandler handler; @@ -59,9 +58,8 @@ class ConnectionImpl : public Bounds, bool isClosed; bool isClosing; - template <class F> void detachAll(const F&); + template <class F> void closeInternal(const F&); - SessionVector closeInternal(const sys::Mutex::ScopedLock&); void incoming(framing::AMQFrame& frame); void closed(uint16_t, const std::string&); void idleOut(); |