[SUREFIRE-1939] Fix NPE in SystemUtils.toJdkHomeFromJvmExec if java h…

…ome has 2 components
apache · Nov 13, 2021 · a6bc580 · a6bc580
1 parent 670dbe4
commit a6bc580
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java
@@ -88,7 +88,7 @@ public static boolean endsWithJavaPath( String jvmExecPath )
     public static File toJdkHomeFromJvmExec( String jvmExecutable )
     {
         File bin = new File( jvmExecutable ).getAbsoluteFile().getParentFile();
-        if ( "bin".equals( bin.getName() ) )
+        if ( bin != null && "bin".equals( bin.getName() ) )
         {
             File parent = bin.getParentFile();
             if ( "jre".equals( parent.getName() ) )

diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java
@@ -98,6 +98,15 @@ public void incorrectJdkPath()
             assertThat( SystemUtils.isJava9AtLeast( incorrect.getAbsolutePath() ) ).isFalse();
         }
 
+        @Test
+        public void incorrectJdkPathShouldNotNPE()
+        {
+            File jre = new File( "/opt/jdk" );
+            File jdk = jre.getParentFile();
+            File incorrect = jdk.getParentFile();
+            assertThat( SystemUtils.isJava9AtLeast( incorrect.getAbsolutePath() ) ).isFalse();
+        }
+
         @Test
         public void shouldHaveJavaPath()
         {