3 files changed, 52 insertions, 11 deletions
diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index 566fbda406..29920bb71a 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -122,10 +122,10 @@ struct ClientT {
     qpid::client::LocalQueue lq;
     std::string name;
 
-    ClientT(uint16_t port, const std::string& name_=std::string())
-        : connection(port), session(connection.newSession(name_)), subs(session), name(name_) {}
-    ClientT(const qpid::client::ConnectionSettings& settings, const std::string& name_=std::string())
-        : connection(settings), session(connection.newSession(name_)), subs(session), name(name_) {}
+    ClientT(uint16_t port, const std::string& name_=std::string(), int timeout=0)
+        : connection(port), session(connection.newSession(name_,timeout)), subs(session), name(name_) {}
+    ClientT(const qpid::client::ConnectionSettings& settings, const std::string& name_=std::string(), int timeout=0)
+        : connection(settings), session(connection.newSession(name_, timeout)), subs(session), name(name_) {}
 
     ~ClientT() { close(); }
     void close() { session.close(); connection.close(); }
diff --git a/cpp/src/tests/ClusterFailover.cpp b/cpp/src/tests/ClusterFailover.cpp
index 6b1ef99807..06fc1c06be 100644
--- a/cpp/src/tests/ClusterFailover.cpp
+++ b/cpp/src/tests/ClusterFailover.cpp
@@ -50,19 +50,60 @@ using boost::shared_ptr;
 // Timeout for tests that wait for messages
 const sys::Duration TIMEOUT=sys::TIME_SEC/4;
 
+ClusterFixture::Args getArgs() {
+    ClusterFixture::Args args;
+    args += "--auth", "no", "--no-module-dir", "--load-module", getLibPath("CLUSTER_LIB");
+    return args;
+}
 
 // Test re-connecting with same session name after a failure.
 QPID_AUTO_TEST_CASE(testReconnectSameSessionName) {
-    ostringstream clusterLib;
-    clusterLib << getLibPath("CLUSTER_LIB");
-    ClusterFixture::Args args = list_of<string>("--auth")("no")("--no-module-dir")("--no-data-dir")("--load-module")(clusterLib.str());
-    ClusterFixture cluster(2, args, -1);
-    Client c0(cluster[0], "foo");
+    ClusterFixture cluster(2, getArgs(), -1);
+    // Specify a timeout to make sure it is ignored, session resume is
+    // not implemented so sessions belonging to dead brokers should
+    // not be kept.
+    Client c0(cluster[0], "foo", 5);
     BOOST_CHECK_EQUAL(2u, knownBrokerPorts(c0.connection, 2).size()); // wait for both.
+    c0.session.queueDeclare("q");
+    c0.session.messageTransfer(arg::content=Message("sendme", "q"));
+    BOOST_CHECK_EQUAL(c0.subs.get("q").getData(), "sendme");
     cluster.killWithSilencer(0, c0.connection, 9);
-    Client c1(cluster[1], "foo"); // Using same name, should be cleaned up.
+    Client c1(cluster[1], "foo", 5);
+    c1.session.queueQuery();    // Try to use the session.
 }
 
+QPID_AUTO_TEST_CASE(testReconnectExclusiveQueue) {
+    // Regresion test. Session timeouts should be ignored
+    // by the broker as session resume is not implemented.
+    ClusterFixture cluster(2, getArgs(), -1);
+    Client c0(cluster[0], "foo", 5);
+    c0.session.queueDeclare("exq", arg::exclusive=true);
+    SubscriptionSettings settings;
+    settings.exclusive = true;
+    settings.autoAck = 0;
+    Subscription s0 = c0.subs.subscribe(c0.lq, "exq", settings, "exsub");
+    c0.session.messageTransfer(arg::content=Message("sendme", "exq"));
+    BOOST_CHECK_EQUAL(c0.lq.get().getData(), "sendme");
+
+    // Regression: core dump on exit if unacked messages were left in
+    // a session with a timeout.
+    cluster.kill(0);
+
+    // Regression: session timeouts prevented re-connecting to
+    // exclusive queue.
+    Client c1(cluster[1]);
+    c1.session.queueDeclare("exq", arg::exclusive=true);
+    Subscription s1 = c1.subs.subscribe(c1.lq, "exq", settings, "exsub");
+    s1.cancel();
+
+    // Regression: session timeouts prevented new member joining
+    // cluster with exclusive queues.
+    cluster.add();
+    Client c2(cluster[2]);
+    c2.session.queueQuery();
+}
+
+
 QPID_AUTO_TEST_SUITE_END()
 
 }} // namespace qpid::tests
diff --git a/cpp/src/tests/ClusterFixture.h b/cpp/src/tests/ClusterFixture.h
index 1eee32b9a4..f548ff9376 100644
--- a/cpp/src/tests/ClusterFixture.h
+++ b/cpp/src/tests/ClusterFixture.h
@@ -89,7 +89,7 @@ class ClusterFixture : public vector<uint16_t>  {
     /** Kill a forked broker with sig, or shutdown localBroker. */
     void kill(size_t n, int sig=SIGINT);
 
-    /** Kill a broker and suppressing errors from closing connection c. */
+    /** Kill a broker and suppress errors from closing connection c. */
     void killWithSilencer(size_t n, client::Connection& c, int sig=SIGINT);
 
   private: