8274333: Redundant null comparison after Pattern.split

Reviewed-by: mullan, weijun, rriggs, iris

Author: turbanoff

src/java.base/share/classes/sun/launcher/LauncherHelper.java

@@ -34,11 +34,6 @@
  *
  */
 
-/**
- * A utility package for the java(1), javaw(1) launchers.
- * The following are helper methods that the native launcher uses
- * to perform checks etc. using JNI, see src/share/bin/java.c
- */
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -88,7 +83,11 @@
 import jdk.internal.platform.Container;
 import jdk.internal.platform.Metrics;
 
-
+/**
+ * A utility package for the java(1), javaw(1) launchers.
+ * The following are helper methods that the native launcher uses
+ * to perform checks etc. using JNI, see src/share/bin/java.c
+ */
 public final class LauncherHelper {
 
     // No instantiation
@@ -154,8 +153,8 @@ static void showSettings(boolean printToStderr, String optionFlag,
             long initialHeapSize, long maxHeapSize, long stackSize) {
 
         initOutput(printToStderr);
-        String opts[] = optionFlag.split(":");
-        String optStr = (opts.length > 1 && opts[1] != null)
+        String[] opts = optionFlag.split(":");
+        String optStr = opts.length > 1
                 ? opts[1].trim()
                 : "all";
         switch (optStr) {

src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java

@@ -57,7 +57,7 @@ private static Set<String> decomposeImpl(String algorithm) {
         String[] transTokens = algorithm.split("/");
 
         for (String transToken : transTokens) {
-            if (transToken == null || transToken.isEmpty()) {
+            if (transToken.isEmpty()) {
                 continue;
             }
 
@@ -70,7 +70,7 @@ private static Set<String> decomposeImpl(String algorithm) {
             String[] tokens = PATTERN.split(transToken);
 
             for (String token : tokens) {
-                if (token == null || token.isEmpty()) {
+                if (token.isEmpty()) {
                     continue;
                 }