diff options
| author | Keith Wall <kwall@apache.org> | 2013-01-09 15:48:34 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2013-01-09 15:48:34 +0000 |
| commit | 72bb5ab502b385385d7ff405eeafd863bf7d87ce (patch) | |
| tree | 4475a5d1d4959bcfeb6241d715b34eff22d75bfc | |
| parent | 5493e1c636ffcec7b3514687656cff198ff2708d (diff) | |
| download | qpid-python-72bb5ab502b385385d7ff405eeafd863bf7d87ce.tar.gz | |
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
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.20@1430909 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 3 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 76a3a7f224..2d9ed63fc7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java @@ -959,6 +959,7 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); decrementOutstandingTxnsIfNecessary(); + _txnUpdateTime.set(0); } }); } @@ -968,6 +969,7 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } } @@ -1005,6 +1007,7 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F _txnRejects.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java index 075ed2a87c..85a9433e91 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java @@ -549,6 +549,7 @@ public class ServerSession extends Session _txnCommits.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } @@ -558,6 +559,7 @@ public class ServerSession extends Session _txnRejects.incrementAndGet(); _txnStarts.incrementAndGet(); + _txnUpdateTime.set(0); decrementOutstandingTxnsIfNecessary(); } |