Attachment 1037366 Details for Bug 1181005 – Enable force flag in SessionManager::attach

[patch] Enable force flag in SessionManager::attach

bz1181005_3.patch (text/plain), 2.14 KB, created by Ernie on 2015-06-10 17:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2015-06-10 17:06:01 UTC

Size: 2.14 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/broker/SessionManager.cpp b/qpid/cpp/src/qpid/broker/SessionManager.cpp
>index a2955f3..a39cbab 100644
>--- a/qpid/cpp/src/qpid/broker/SessionManager.cpp
>+++ b/qpid/cpp/src/qpid/broker/SessionManager.cpp
>@@ -47,11 +47,11 @@ SessionManager::~SessionManager() {
>     detached.clear();           // Must clear before destructor as session dtor will call forget()
> }
> 
>-std::auto_ptr<SessionState>  SessionManager::attach(SessionHandler& h, const SessionId& id, bool/*force*/) {
>+std::auto_ptr<SessionState>  SessionManager::attach(SessionHandler& h, const SessionId& id, bool force) {
>     Mutex::ScopedLock l(lock);
>     eraseExpired();             // Clean up expired table
>     std::pair<Attached::iterator, bool> insert = attached.insert(id);
>-    if (!insert.second)
>+    if (!insert.second && !force)
>         throw SessionBusyException(QPID_MSG("Session already attached: " << id));
>     Detached::iterator i = std::find(detached.begin(), detached.end(), id);
>     std::auto_ptr<SessionState> state;
>@@ -62,7 +62,6 @@ std::auto_ptr<SessionState>  SessionManager::attach(SessionHandler& h, const Ses
>         state->attach(h);
>     }
>     return state;
>-    // FIXME aconway 2008-04-29: implement force 
> }
> 
> void  SessionManager::detach(std::auto_ptr<SessionState> session) {
>diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
>index 7c30e5d..ff801c2 100644
>--- a/qpid/python/qpid/messaging/driver.py
>+++ b/qpid/python/qpid/messaging/driver.py
>@@ -591,6 +591,7 @@ class Engine:
>     self.log_id = "%x" % id(self.connection)
>     self._closing = False
>     self._connected = False
>+    self._reconnecting = bool(connection.sessions)
>     self._attachments = {}
> 
>     self._in = LinkIn()
>@@ -874,8 +875,9 @@ class Engine:
>       else:
>         raise RuntimeError("all channels used")
>       sst = SessionState(self, ssn, ssn.name, ch)
>-      sst.write_op(SessionAttach(name=ssn.name))
>+      sst.write_op(SessionAttach(name=ssn.name, force=self._reconnecting))
>       sst.write_op(SessionCommandPoint(sst.sent, 0))
>+      self._reconnecting = False
>       sst.outgoing_idx = 0
>       sst.acked = []
>       sst.acked_idx = 0

Actions: View | Diff

Attachments on bug 1181005: 1028385 | 1028876 | 1037366