From 58ff576f0a0eecc8a7387626b66723cb1d89ad27 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 11 Feb 2014 19:12:57 -0500 Subject: [PATCH] Revert "Use dedicated exceptions to track incompatible/missing plugin" This reverts commit b32d0e4f7414e4f144148e8e39cc308b2f9131a8. --- core/src/main/java/hudson/PluginWrapper.java | 21 ++------------------ 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index e35d03ba8d..71370d4cdd 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -501,10 +501,10 @@ public class PluginWrapper implements Comparable, ModelObject { } if (!missingDependencies.isEmpty()) - throw new MissingDepencyException("Dependency "+Util.join(missingDependencies, ", ")+" doesn't exist", missingDependencies); + throw new IOException("Dependency "+Util.join(missingDependencies, ", ")+" doesn't exist"); if (!incompatibleDependencies.isEmpty()) - throw new IncompatibleDependencyException("Dependency "+Util.join(incompatibleDependencies, ", ")+" doesn't match required version", incompatibleDependencies); + throw new IOException("Dependency "+Util.join(incompatibleDependencies, ", ")+" doesn't match required version"); } @@ -646,21 +646,4 @@ public class PluginWrapper implements Comparable, ModelObject { private static final Logger LOGGER = Logger.getLogger(PluginWrapper.class.getName()); - public class IncompatibleDependencyException extends IOException { - public final List plugins; - - public IncompatibleDependencyException(String message, List plugins) { - super(message); - this.plugins = plugins; - } - } - - public class MissingDepencyException extends IOException { - public final List plugins; - - public MissingDepencyException(String message, List plugins) { - super(message); - this.plugins = plugins; - } - } }