Author: kwall Date: Wed Jan 9 15:48:34 2013 New Revision: 1430909 URL: http://svn.apache.org/viewvc?rev=1430909&view=rev Log: QPID-4503: Producer transaction timeout detection feature may produce suprious open/idle alerts and close client connections/sessions without good cause
Merged from trunk with command svn merge -c 1424427 https://svn.apache.org/repos/asf/qpid/trunk/qpid/java Modified: qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java Modified: qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1430909&r1=1430908&r2=1430909&view=diff ============================================================================== --- qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original) +++ qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Wed Jan 9 15:48:34 2013 @@ -959,6 +959,7 @@ public class AMQChannel implements AMQSe _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); decrementOutstandingTxnsIfNecessary(); + _txnUpdateTime.set(0); } }); } @@ -968,6 +969,7 @@ public class AMQChannel implements AMQSe _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } } @@ -1005,6 +1007,7 @@ public class AMQChannel implements AMQSe _txnRejects.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } Modified: qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java?rev=1430909&r1=1430908&r2=1430909&view=diff ============================================================================== --- qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java (original) +++ qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java Wed Jan 9 15:48:34 2013 @@ -549,6 +549,7 @@ public class ServerSession extends Sessi _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } @@ -558,6 +559,7 @@ public class ServerSession extends Sessi _txnRejects.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
