Andrew, Have you tested this change with the C++ test profiles ? Anytime the 0-10 code path is changed, please make sure to test with the C++ test profiles.
For example a recent checkin cause the JMSProperty test to fail (I believe in all test profiles). While it's understandable that humans make mistakes, it's important we ensure that the builds don't break. Rajith On Mon, Jul 26, 2010 at 9:56 AM, <[email protected]> wrote: > Author: grkvlt > Date: Mon Jul 26 13:56:52 2010 > New Revision: 979283 > > URL: http://svn.apache.org/viewvc?rev=979283&view=rev > Log: > QPID-2586: Give Client 0-10 close semantics not detach > > Added a sessionRequestTimeout handler that sets expiry and responds with a > sessionTimeout, and makes sessionTimeout set expiry appropriately also. On > attach uses the expiry provided, rather than forcing a value of 0. > > Modified: > > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java > > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java > > Modified: > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java > URL: > http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java?rev=979283&r1=979282&r2=979283&view=diff > ============================================================================== > --- > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java > (original) > +++ > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java > Mon Jul 26 13:56:52 2010 > @@ -237,9 +237,7 @@ public class Session extends SessionInvo > { > initReceiver(); > sessionAttach(name.getBytes()); > - // XXX: when the broker and client support full session > - // recovery we should use expiry as the requested timeout > - sessionRequestTimeout(0); > + sessionRequestTimeout(expiry); > } > > void resume() > > Modified: > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java > URL: > http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java?rev=979283&r1=979282&r2=979283&view=diff > ============================================================================== > --- > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java > (original) > +++ > qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java > Mon Jul 26 13:56:52 2010 > @@ -57,6 +57,12 @@ public class SessionDelegate > log.warn("UNHANDLED: [%s] %s", ssn, method); > } > > + �...@override public void sessionRequestTimeout(Session ssn, > SessionRequestTimeout t) > + { > + ssn.setExpiry(t.getTimeout()); > + ssn.sessionTimeout(t.getTimeout()); > + } > + > @Override public void sessionAttached(Session ssn, SessionAttached atc) > { > ssn.setState(Session.State.OPEN); > @@ -64,9 +70,7 @@ public class SessionDelegate > > @Override public void sessionTimeout(Session ssn, SessionTimeout t) > { > - // XXX: we ignore this right now, we should uncomment this > - // when full session resume is supported: > - // ssn.setExpiry(t.getTimeout()); > + ssn.setExpiry(t.getTimeout()); > } > > @Override public void sessionCompleted(Session ssn, SessionCompleted cmp) > > > > --------------------------------------------------------------------- > Apache Qpid - AMQP Messaging Implementation > Project: http://qpid.apache.org > Use/Interact: mailto:[email protected] > > -- Regards, Rajith Attapattu Red Hat http://rajith.2rlabs.com/ --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
