From e7478bb3f7584c5a9b1214e43ede5f5e647fb2ba Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 6 Jan 2009 02:07:20 +0000 Subject: QPID-1557: fixed the cpp.cluster test profile - pulled out the XA excludes into a separate excludes file - made the cluster profile exclude the XA tests - made the build system automatically set all system properties that start with profile - added a profile.clustered property that defaults to false - made the cpp.cluster test profile set the profile.clustered property to true - modified the failover tests to exclude some erroneous asserts if the broker is clustered - modified the java client to not advertize a non-zero timeout git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@731810 13f79535-47bb-0310-9956-ffa450edef68 --- java/common/src/main/java/org/apache/qpid/transport/Session.java | 9 ++++++++- .../src/main/java/org/apache/qpid/transport/SessionDelegate.java | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/transport/Session.java b/java/common/src/main/java/org/apache/qpid/transport/Session.java index 22561dcc33..1a44ed8973 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/Session.java +++ b/java/common/src/main/java/org/apache/qpid/transport/Session.java @@ -179,7 +179,9 @@ public class Session extends SessionInvoker { initReceiver(); sessionAttach(name.getBytes()); - sessionRequestTimeout(expiry); + // XXX: when the broker and client support full session + // recovery we should use expiry as the requested timeout + sessionRequestTimeout(0); } void resume() @@ -734,6 +736,11 @@ public class Session extends SessionInvoker synchronized (commands) { state = CLOSING; + // XXX: we manually set the expiry to zero here to + // simulate full session recovery in brokers that don't + // support it, we should remove this line when there is + // broker support for full session resume: + expiry = 0; sessionRequestTimeout(0); sessionDetach(name.getBytes()); Waiter w = new Waiter(commands, timeout); diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java index 520291e71c..b2c22f22e9 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java +++ b/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java @@ -64,7 +64,9 @@ public class SessionDelegate @Override public void sessionTimeout(Session ssn, SessionTimeout t) { - ssn.setExpiry(t.getTimeout()); + // XXX: we ignore this right now, we should uncomment this + // when full session resume is supported: + // ssn.setExpiry(t.getTimeout()); } @Override public void sessionCompleted(Session ssn, SessionCompleted cmp) -- cgit v1.2.1