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 2017/10/09 16:54:54 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1455 HQ222142: Error on
resetting large message deliver - null: java.lang.NullPointerException
ARTEMIS-1455 HQ222142: Error on resetting large message deliver - null: java.lang.NullPointerException
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/53efdbab
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/53efdbab
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/53efdbab
Branch: refs/heads/master
Commit: 53efdbab49eea8755571b2e76ae3f8bf62d364be
Parents: 16aa7ed
Author: Dmitrii Tikhomirov <dt...@redhat.com>
Authored: Mon Oct 9 11:51:32 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 9 12:54:46 2017 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/53efdbab/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 edd15ce..704e563 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
@@ -607,8 +607,9 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
boolean performACK = lastConsumedAsDelivered;
try {
- if (largeMessageDeliverer != null) {
- largeMessageDeliverer.finish();
+ LargeMessageDeliverer pendingLargeMessageDeliverer = largeMessageDeliverer;
+ if (pendingLargeMessageDeliverer != null) {
+ pendingLargeMessageDeliverer.finish();
}
} catch (Throwable e) {
ActiveMQServerLogger.LOGGER.errorResttingLargeMessage(e, largeMessageDeliverer);