You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/03/11 21:33:34 UTC
[1/2] activemq-artemis git commit: This closes #420
Repository: activemq-artemis
Updated Branches:
refs/heads/master 4ba11c8bb -> 8ce17b2be
This closes #420
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8ce17b2b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8ce17b2b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8ce17b2b
Branch: refs/heads/master
Commit: 8ce17b2be60b1d8a39c1c5b53f8f53d535ce493c
Parents: 4ba11c8 196f0ca
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Mar 11 15:33:28 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 11 15:33:28 2016 -0500
----------------------------------------------------------------------
.../core/server/impl/ServerConsumerImpl.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-432 client gets msg after
session stop
Posted by cl...@apache.org.
ARTEMIS-432 client gets msg after session stop
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/196f0ca8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/196f0ca8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/196f0ca8
Branch: refs/heads/master
Commit: 196f0ca8d6b9e91f042481e3595105f29c3f01bd
Parents: 4ba11c8
Author: jbertram <jb...@apache.org>
Authored: Thu Mar 10 17:11:14 2016 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 11 15:33:28 2016 -0500
----------------------------------------------------------------------
.../core/server/impl/ServerConsumerImpl.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/196f0ca8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 25c657e..1f2be69 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -344,10 +344,10 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
ref.getQueue().acknowledge(ref);
}
- }
+ if (message.isLargeMessage() && this.supportLargeMessage) {
+ largeMessageDeliverer = new LargeMessageDeliverer((LargeServerMessage) message, ref);
+ }
- if (message.isLargeMessage() && this.supportLargeMessage) {
- largeMessageDeliverer = new LargeMessageDeliverer((LargeServerMessage) message, ref);
}
lockDelivery.readLock().lock();
@@ -559,7 +559,13 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
@Override
public void setStarted(final boolean started) {
synchronized (lock) {
- this.started = browseOnly || started;
+ lockDelivery.writeLock().lock();
+ try {
+ this.started = browseOnly || started;
+ }
+ finally {
+ lockDelivery.writeLock().unlock();
+ }
}
// Outside the lock
@@ -966,6 +972,10 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
public boolean deliver() throws Exception {
lockDelivery.readLock().lock();
try {
+ if (!started) {
+ return false;
+ }
+
LargeServerMessage currentLargeMessage = largeMessage;
if (currentLargeMessage == null) {
return true;