Merge branch 'java7'

rjolly · Feb 28, 2020 · f1228bd · f1228bd
2 parents 20912b4 + 7428ee2
commit f1228bd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/src/main/java/linoleum/application/Packages.java b/application/src/main/java/linoleum/application/Packages.java
@@ -61,7 +61,10 @@ public boolean accept(final File file) {
 		add1(new File(javaHome, "lib/tools.jar"));
 		add1(new File(javaHome, "lib/jconsole.jar"));
 		if (jar != null && System.getProperty("linoleum.home") == null) {
-			System.setProperty("linoleum.home", jar.getParent());
+			final String str = jar.getParent();
+			if (str != null) {
+				System.setProperty("linoleum.home", str);
+			}
 		}
 		try {
 			final String str = System.getProperty("linoleum.home");