From 8598492f193cab9633c6d32e13a9d463bc207007 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Thu, 27 Sep 2018 01:23:28 +0200 Subject: [PATCH] =?UTF-8?q?Ignored=20Exceptions:=20use=20=E2=80=98ignored?= =?UTF-8?q?=E2=80=99=20to=20supress=20IntellijIDEA=20warnings=20as=20sugge?= =?UTF-8?q?sted=20by=20@daniel-beck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/hudson/ClassicPluginStrategy.java | 9 +++++---- core/src/main/java/hudson/FilePath.java | 6 +++--- core/src/main/java/hudson/model/queue/Executables.java | 2 +- core/src/main/java/hudson/os/solaris/ZFSInstaller.java | 2 +- core/src/main/java/jenkins/model/Jenkins.java | 2 +- .../slaves/restarter/JnlpSlaveRestarterInstaller.java | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 2fdfd6427e..af0521fab8 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -778,19 +778,20 @@ public class ClassicPluginStrategy implements PluginStrategy { Class c = ClassLoaderReflectionToolkit._findLoadedClass(pw.classLoader, name); if (c!=null) return c; return ClassLoaderReflectionToolkit._findClass(pw.classLoader, name); - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException ignored) { //not found. try next } } } else { for (Dependency dep : dependencies) { PluginWrapper p = pluginManager.getPlugin(dep.shortName); - if(p!=null) + if(p!=null) { try { return p.classLoader.loadClass(name); - } catch (ClassNotFoundException ex) { - // try next + } catch (ClassNotFoundException ignored) { + // OK, try next } + } } } diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index f3091386e4..e9504a71c6 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -2309,7 +2309,7 @@ public final class FilePath implements Serializable { // legacy agent.jar. Handle this gracefully try { LOGGER.log(Level.WARNING,"Looks like an old agent.jar. Please update "+ Which.jarFile(Channel.class)+" to the new version",e); - } catch (IOException ex) { + } catch (IOException ignored) { // really ignore this time } } @@ -2427,8 +2427,8 @@ public final class FilePath implements Serializable { // report both errors e.addSuppressed(x); throw e; - } catch (TimeoutException ex) { - // remote is hanging + } catch (TimeoutException ignored) { + // remote is hanging, just throw the original exception throw e; } } diff --git a/core/src/main/java/hudson/model/queue/Executables.java b/core/src/main/java/hudson/model/queue/Executables.java index acb0e1fdfc..426c12df96 100644 --- a/core/src/main/java/hudson/model/queue/Executables.java +++ b/core/src/main/java/hudson/model/queue/Executables.java @@ -46,7 +46,7 @@ public class Executables { throws Error, RuntimeException { try { return e.getParent(); - } catch (AbstractMethodError ex) { + } catch (AbstractMethodError ignored) { // will fallback to a private implementation try { Method m = e.getClass().getMethod("getParent"); m.setAccessible(true); diff --git a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java b/core/src/main/java/hudson/os/solaris/ZFSInstaller.java index d14b2dd748..f22a0b7879 100644 --- a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java +++ b/core/src/main/java/hudson/os/solaris/ZFSInstaller.java @@ -219,7 +219,7 @@ public class ZFSInstaller extends AdministrativeMonitor implements Serializable // revert the file system creation try { hudson.destory(); - } catch (Exception ex) { + } catch (Exception ignored) { // but ignore the error and let the original error thrown } throw e; diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index e4880248e3..ba8e826317 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -5030,7 +5030,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve if (idx > 0) { return new VersionNumber(versionString.substring(0,idx)); } - } catch (NumberFormatException ex) { + } catch (NumberFormatException ignored) { // fall through } diff --git a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java index 222998caaf..3a8b9f6b42 100644 --- a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java +++ b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java @@ -77,7 +77,7 @@ public class JnlpSlaveRestarterInstaller extends ComputerListener implements Ser try { Engine.class.getMethod("addListener", EngineListener.class); - } catch (NoSuchMethodException ex) { + } catch (NoSuchMethodException ignored) { return null; // running with older version of remoting that doesn't support adding listener } -- GitLab