diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-01-06 02:07:20 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-01-06 02:07:20 +0000 |
| commit | e7478bb3f7584c5a9b1214e43ede5f5e647fb2ba (patch) | |
| tree | 186b5e3c5acdf2948766a9f7e7632ca85d3c4231 /java/common/src | |
| parent | a0e5e94ef8dcace73d55bcd683b78cd3a93e9310 (diff) | |
| download | qpid-python-e7478bb3f7584c5a9b1214e43ede5f5e647fb2ba.tar.gz | |
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
Diffstat (limited to 'java/common/src')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/Session.java | 9 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java | 4 |
2 files changed, 11 insertions, 2 deletions
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) |