NO-JIRA: Fix NPE in ClasspathQuery used in integration tests
diff --git a/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java b/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
index 9f4844c..97fce1f 100644
--- a/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
+++ b/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
@@ -154,7 +154,12 @@
private String buildClassPath(final Class<?> clientClazz, final Collection<String> gavs)
{
- List<File> classpathElements = new ArrayList<>(_classpathCache.getUnchecked(gavs));
+ final List<File> cached = _classpathCache.getUnchecked(gavs);
+ List<File> classpathElements = new ArrayList<>();
+ if (cached != null)
+ {
+ classpathElements.addAll(cached);
+ }
classpathElements.add(getLocalClasspathElement(clientClazz));
return Joiner.on(System.getProperty("path.separator")).join(classpathElements);