diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 75e0873c4380..56065582aeec 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -1114,7 +1114,7 @@ protected void copyBundledPlugin(URL src, String fileName) throws IOException { try(final JarFile jarFile = jarURLConnection.getJarFile()) { final JarEntry entry = (entryName != null && jarFile != null) ? jarFile.getJarEntry(entryName) : null; - if (entry != null && jarFile != null) { + if (entry != null) { try(InputStream i = jarFile.getInputStream(entry)) { byte[] manifestBytes = IOUtils.toByteArray(i); in = new ByteArrayInputStream(manifestBytes); diff --git a/core/src/main/java/hudson/model/StringParameterDefinition.java b/core/src/main/java/hudson/model/StringParameterDefinition.java index 3573199a01e4..c9925665588f 100644 --- a/core/src/main/java/hudson/model/StringParameterDefinition.java +++ b/core/src/main/java/hudson/model/StringParameterDefinition.java @@ -132,7 +132,7 @@ public ParameterValue createValue(StaplerRequest req, JSONObject jo) { public ParameterValue createValue(String str) { StringParameterValue value = new StringParameterValue(getName(), str, getDescription()); - if (isTrim() && value!=null) { + if (isTrim()) { value.doTrim(); } return value; diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index 936a30a9c066..d95a628b5af9 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -353,7 +353,13 @@ else if (percent && escapeVars percent = (c == '%'); if (quoted) quotedArgs.append(c); } - if(i == 0 && quoted) quotedArgs.insert(0, '"'); else if (i == 0 && !quoted) quotedArgs.append('"'); + if (i == 0) { + if (quoted) { + quotedArgs.insert(0, '"'); + } else { + quotedArgs.append('"'); + } + } if (quoted) quotedArgs.append('"'); else quotedArgs.append(arg); windowsCommand.add(quotedArgs, mask.get(i)); diff --git a/core/src/main/java/hudson/util/SecretRewriter.java b/core/src/main/java/hudson/util/SecretRewriter.java index 5a11e418471b..7970f6cd7067 100644 --- a/core/src/main/java/hudson/util/SecretRewriter.java +++ b/core/src/main/java/hudson/util/SecretRewriter.java @@ -197,7 +197,7 @@ protected boolean isIgnoredDir(File dir) { } private static boolean isBase64(char ch) { - return 0<=ch && ch<128 && IS_BASE64[ch]; + return ch<128 && IS_BASE64[ch]; } private static boolean isBase64(String s) { diff --git a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java index f152e6b05e23..6026d11d5697 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java @@ -210,7 +210,7 @@ private void addInternal(@Nonnull Iterable items) { } } } - } else if (olderThan != null) { + } else { Iterator iter = items.iterator(); while (iter.hasNext()) { Object item = iter.next();