From 3d8c3c417ccddec3f8d7d2e71a4165ca18a7ddc7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 20 Feb 2019 23:35:12 -0500 Subject: [PATCH] Remove useless initialization --- core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +- core/src/main/java/hudson/ProxyConfiguration.java | 2 +- core/src/main/java/hudson/cli/ConnectNodeCommand.java | 2 +- core/src/main/java/hudson/cli/DeleteJobCommand.java | 2 +- core/src/main/java/hudson/cli/DeleteNodeCommand.java | 2 +- core/src/main/java/hudson/cli/DeleteViewCommand.java | 2 +- core/src/main/java/hudson/cli/DisconnectNodeCommand.java | 2 +- core/src/main/java/hudson/cli/OnlineNodeCommand.java | 2 +- core/src/main/java/hudson/model/RunParameterDefinition.java | 2 +- core/src/main/java/hudson/tasks/Maven.java | 2 +- core/src/main/java/hudson/util/ChunkedOutputStream.java | 2 +- .../java/hudson/util/NoClientBindProtocolSocketFactory.java | 2 +- core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java | 2 +- .../commons/validator/routines/InetAddressValidator.java | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 0521dbd70d..d15ff788e6 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -159,7 +159,7 @@ public class ClassicPluginStrategy implements PluginStrategy { @Override public PluginWrapper createPluginWrapper(File archive) throws IOException { final Manifest manifest; - URL baseResourceURL = null; + URL baseResourceURL; File expandDir = null; // if .hpi, this is the directory where war is expanded diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java index f6560c6a05..f621ef0f53 100644 --- a/core/src/main/java/hudson/ProxyConfiguration.java +++ b/core/src/main/java/hudson/ProxyConfiguration.java @@ -385,7 +385,7 @@ public final class ProxyConfiguration extends AbstractDescribableImpl names = null; for (String node_s : hs) { - Computer computer = null; + Computer computer; try { computer = jenkins.getComputer(node_s); diff --git a/core/src/main/java/hudson/cli/DeleteJobCommand.java b/core/src/main/java/hudson/cli/DeleteJobCommand.java index 0cb1ee7f5a..f6c4fe5c9e 100644 --- a/core/src/main/java/hudson/cli/DeleteJobCommand.java +++ b/core/src/main/java/hudson/cli/DeleteJobCommand.java @@ -59,7 +59,7 @@ public class DeleteJobCommand extends CLICommand { final HashSet hs = new HashSet<>(jobs); for (String job_s: hs) { - AbstractItem job = null; + AbstractItem job; try { job = (AbstractItem) jenkins.getItemByFullName(job_s); diff --git a/core/src/main/java/hudson/cli/DeleteNodeCommand.java b/core/src/main/java/hudson/cli/DeleteNodeCommand.java index 765d10a878..ed1a178267 100644 --- a/core/src/main/java/hudson/cli/DeleteNodeCommand.java +++ b/core/src/main/java/hudson/cli/DeleteNodeCommand.java @@ -59,7 +59,7 @@ public class DeleteNodeCommand extends CLICommand { final HashSet hs = new HashSet<>(nodes); for (String node_s : hs) { - Node node = null; + Node node; try { node = jenkins.getNode(node_s); diff --git a/core/src/main/java/hudson/cli/DeleteViewCommand.java b/core/src/main/java/hudson/cli/DeleteViewCommand.java index fc49e0ba6d..b2ebffac80 100644 --- a/core/src/main/java/hudson/cli/DeleteViewCommand.java +++ b/core/src/main/java/hudson/cli/DeleteViewCommand.java @@ -62,7 +62,7 @@ public class DeleteViewCommand extends CLICommand { ViewOptionHandler voh = new ViewOptionHandler(null, null, null); for(String view_s : hs) { - View view = null; + View view; try { view = voh.getView(view_s); diff --git a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java index 12097601dd..34da7d8cf6 100644 --- a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java +++ b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java @@ -66,7 +66,7 @@ public class DisconnectNodeCommand extends CLICommand { List names = null; for (String node_s : hs) { - Computer computer = null; + Computer computer; try { computer = jenkins.getComputer(node_s); diff --git a/core/src/main/java/hudson/cli/OnlineNodeCommand.java b/core/src/main/java/hudson/cli/OnlineNodeCommand.java index 0594d3770c..b3ec4fc0c9 100644 --- a/core/src/main/java/hudson/cli/OnlineNodeCommand.java +++ b/core/src/main/java/hudson/cli/OnlineNodeCommand.java @@ -60,7 +60,7 @@ public class OnlineNodeCommand extends CLICommand { List names = null; for (String node_s : hs) { - Computer computer = null; + Computer computer; try { computer = jenkins.getComputer(node_s); diff --git a/core/src/main/java/hudson/model/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java index c78b3f9743..011537c0e3 100644 --- a/core/src/main/java/hudson/model/RunParameterDefinition.java +++ b/core/src/main/java/hudson/model/RunParameterDefinition.java @@ -165,7 +165,7 @@ public class RunParameterDefinition extends SimpleParameterDefinition { return createValue(runId); } - Run lastBuild = null; + Run lastBuild; Job project = getProject(); if (project == null) { diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 5f5410b59e..229c3680da 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -129,7 +129,7 @@ public class Maven extends Builder { * * @since 1.322 */ - public boolean usePrivateRepository = false; + public boolean usePrivateRepository; /** * Provides access to the settings.xml to be used for a build. diff --git a/core/src/main/java/hudson/util/ChunkedOutputStream.java b/core/src/main/java/hudson/util/ChunkedOutputStream.java index 3a68d4dbf8..18d6618932 100644 --- a/core/src/main/java/hudson/util/ChunkedOutputStream.java +++ b/core/src/main/java/hudson/util/ChunkedOutputStream.java @@ -56,7 +56,7 @@ public class ChunkedOutputStream extends OutputStream { private static final byte[] ZERO = new byte[]{(byte) '0'}; // ----------------------------------------------------- Instance Variables - private OutputStream stream = null; + private OutputStream stream; private byte[] cache; diff --git a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java b/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java index 18a3e3e761..6c0f3ccbd3 100644 --- a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java +++ b/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java @@ -100,7 +100,7 @@ public class NoClientBindProtocolSocketFactory implements ProtocolSocketFactory */ public Socket createSocket(String host, int port) throws IOException, UnknownHostException,IOException { - Socket socket = null; + Socket socket; try { socket = new Socket(host, port); } diff --git a/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java b/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java index cfa342e513..895148909f 100644 --- a/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java +++ b/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java @@ -29,7 +29,7 @@ public class ClassLoaderReflectionToolkit { } catch (NoSuchMethodException e) { throw new AssertionError(e); } - Method gCLL = null; + Method gCLL; try { gCLL = ClassLoader.class.getDeclaredMethod("getClassLoadingLock", String.class); gCLL.setAccessible(true); diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java index 25e0466900..d121a121e0 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java @@ -103,7 +103,7 @@ public class InetAddressValidator implements Serializable { return false; } - int iIpSegment = 0; + int iIpSegment; try { iIpSegment = Integer.parseInt(ipSegment); @@ -176,7 +176,7 @@ public class InetAddressValidator implements Serializable { if (octet.length() > IPV6_MAX_HEX_DIGITS_PER_GROUP) { return false; } - int octetInt = 0; + int octetInt; try { octetInt = Integer.parseInt(octet, BASE_16); } catch (NumberFormatException e) {