[activemq-artemis] branch master updated: ARTEMIS-2830 NPE in XML exporter

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new b8add9f  ARTEMIS-2830 NPE in XML exporter
     new 46cca85  This closes #3207
b8add9f is described below

commit b8add9f2c48303cfaaa86bd86624ecf3d9b12627
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Mon Jun 29 13:43:06 2020 -0500

    ARTEMIS-2830 NPE in XML exporter
---
 .../artemis/cli/commands/tools/xml/XmlDataExporter.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 08ffec3..1daf213 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -276,10 +276,12 @@ public final class XmlDataExporter extends DBOption {
       for (RecordInfo info : acks) {
          AckDescribe ack = (AckDescribe) 
DescribeJournal.newObjectEncoding(info, null);
          HashMap<Long, ReferenceDescribe> referenceDescribeHashMap = 
messageRefs.get(info.id);
-         referenceDescribeHashMap.remove(ack.refEncoding.queueID);
-         if (referenceDescribeHashMap.size() == 0) {
-            messages.remove(info.id);
-            messageRefs.remove(info.id);
+         if (referenceDescribeHashMap != null) {
+            referenceDescribeHashMap.remove(ack.refEncoding.queueID);
+            if (referenceDescribeHashMap.size() == 0) {
+               messages.remove(info.id);
+               messageRefs.remove(info.id);
+            }
          }
       }
    }