You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/14 00:54:57 UTC

qpid-jms git commit: QPIDJMS-125 Don't mark the TX failed on connection interrupt unless there is pending work, let the recovery method decide at that point incase something happens inbetween.

Repository: qpid-jms
Updated Branches:
  refs/heads/master dce0b04cb -> dd6b7fc6e


QPIDJMS-125 Don't mark the TX failed on connection interrupt unless
there is pending work, let the recovery method decide at that point
incase something happens inbetween.  

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/dd6b7fc6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/dd6b7fc6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/dd6b7fc6

Branch: refs/heads/master
Commit: dd6b7fc6ec64a9ca64ac94c245aa0ca7aefd2d13
Parents: dce0b04
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Oct 13 18:54:51 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Oct 13 18:54:51 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dd6b7fc6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java
index 7d60fa7..cf5043e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsLocalTransactionContext.java
@@ -269,7 +269,7 @@ public class JmsLocalTransactionContext implements JmsTransactionContext {
     public void onConnectionInterrupted() {
         lock.writeLock().tryLock();
         try {
-            failed = true;
+            failed = hasWork;
         } finally {
             if (lock.writeLock().isHeldByCurrentThread()) {
                 lock.writeLock().unlock();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org