From bf7fd088104d68c333f24b706c19d9d3bd80dfa4 Mon Sep 17 00:00:00 2001 From: hanna Date: Thu, 30 Sep 2010 19:07:05 +0000 Subject: [PATCH] Fix newly-introduced bug in the PluginManager/DynamicClassResolutionException where, when the system can't find a plugin of the correct name, the system prefers to crap all over itself and throw an unintelligible NullPointerException rather than displaying an intelligent error. git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4393 348d0f76-0448-11de-a6fe-93d51630548a --- .../sting/utils/classloader/PluginManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java b/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java index bc26a0609..463e25cd3 100644 --- a/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java +++ b/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java @@ -27,6 +27,7 @@ package org.broadinstitute.sting.utils.classloader; import org.broadinstitute.sting.utils.exceptions.ReviewedStingException; import org.broadinstitute.sting.utils.exceptions.DynamicClassResolutionException; +import org.broadinstitute.sting.utils.exceptions.UserException; import java.util.HashMap; import java.util.List; @@ -85,9 +86,9 @@ public abstract class PluginManager { */ public PluginType createByName(String pluginName) { Class plugin = pluginsByName.get(pluginName); + if( plugin == null ) + throw new UserException(String.format("Could not find %s with name: %s", pluginCategory,pluginName)); try { - if( plugin == null ) - throw new ReviewedStingException(String.format("Could not find %s with name: %s", pluginCategory,pluginName)); return plugin.newInstance(); } catch (Exception e) { throw new DynamicClassResolutionException(plugin, e);