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 b80a78d  ARTEMIS-1058 Fixing testsuite
b80a78d is described below

commit b80a78d885e2568af41fc133b0185399385eda0c
Author: Clebert Suconic <clebertsuconic@apache.org>
AuthorDate: Tue Feb 12 09:42:28 2019 +0100

    ARTEMIS-1058 Fixing testsuite
    
    Possible NPE that will happen on ReplicatedFailoverTest only
---
 .../activemq/artemis/utils/SpawnedVMSupport.java       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index 6f47c82..82724c1 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -141,13 +141,19 @@ public class SpawnedVMSupport {
 
       StringBuilder stringBuilder = new StringBuilder();
       boolean empty = true;
-      for (File f : libfolder.listFiles()) {
-         if (f.getName().endsWith(".jar") || f.getName().endsWith(".zip")) {
-            if (!empty) {
-               stringBuilder.append(File.pathSeparator);
+      File[] files = libfolder.listFiles();
+
+      if (files == null) {
+         return getClassPath();
+      } else {
+         for (File f : libfolder.listFiles()) {
+            if (f.getName().endsWith(".jar") || f.getName().endsWith(".zip")) {
+               if (!empty) {
+                  stringBuilder.append(File.pathSeparator);
+               }
+               empty = false;
+               stringBuilder.append(f.toString());
             }
-            empty = false;
-            stringBuilder.append(f.toString());
          }
       }