summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-12-16 16:56:59 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-12-16 16:56:59 +0000
commitf62711351f225b7ac77cebe5066fa0a69cdbdf00 (patch)
treef2e87a10f76bcac15a80d251448a1ac1d5f511af /qpid/java/client/src
parent77dbff8daed044b9c95ef0c210b5fe69ff9bbc2c (diff)
downloadqpid-python-f62711351f225b7ac77cebe5066fa0a69cdbdf00.tar.gz
QPID-5099 : [Java Client] release pre-acquired messages after explicit consumer close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1646009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 3d0e972ca2..b1e606b8e9 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -645,6 +645,12 @@ public abstract class BasicMessageConsumer<U> extends Closeable implements Messa
_receivingThread.interrupt();
}
+
+
+ if(!(isBrowseOnly() || getSession().isClosing()))
+ {
+ rollback();
+ }
}
}