From f71380f7fa6f084e881267137e75b6033fe6f07d Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sun, 26 Sep 2021 17:56:39 +0300 Subject: [PATCH] [PATCH] Remove redundant 'null' comparison after Pattern.split --- .../classes/sun/launcher/LauncherHelper.java | 15 +++++++-------- .../sun/security/util/AlgorithmDecomposer.java | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java index 82b73d01c6b63..1f2db91f472b1 100644 --- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java +++ b/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) { diff --git a/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java b/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java index ee97d461ac127..71f63e40bcd80 100644 --- a/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java +++ b/src/java.base/share/classes/sun/security/util/AlgorithmDecomposer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +47,7 @@ private static Set decomposeImpl(String algorithm) { String[] transTokens = algorithm.split("/"); for (String transToken : transTokens) { - if (transToken == null || transToken.isEmpty()) { + if (transToken.isEmpty()) { continue; } @@ -60,7 +60,7 @@ private static Set decomposeImpl(String algorithm) { String[] tokens = PATTERN.split(transToken); for (String token : tokens) { - if (token == null || token.isEmpty()) { + if (token.isEmpty()) { continue; }