commit c8019ddd6df0c95fcacf7d9c8fb476ddbc2ffdb0
author Russell Howe <rhowe@siksai.co.uk> Sat May 04 12:48:38 2019 +0100
committer Russell Howe <rhowe@siksai.co.uk> Sun May 05 09:05:51 2019 +0100
tree d4a1e75ed94de2ffdd168178ab399685a76028b4
parent 997206f821c65de512945c63ff83f59814cde2f3

MCOMPILER-384: Stop checking for null before instanceof

As per the Java specification, x instanceof y will return false if x is null:
https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20.2

src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java

diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
index 8bc437b..bba63c0 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -230,7 +230,7 @@
                                        .setMainModuleDescriptor( moduleDescriptorPath );
                 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( new File( ( (DefaultJavaToolChain) toolchain ).getJavaHome() ) );
                 }

src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java

diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
index adfdf2d..5b0518b 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -241,7 +241,7 @@
                                 .setMainModuleDescriptor( mainModuleDescriptorClassFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );
                 }
@@ -285,7 +285,7 @@
                                 .setMainModuleDescriptor( testModuleDescriptorJavaFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );
                 }