From 1a8893a9a91932984f30cbffbd682cf59dae5183 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 24 Jul 2012 10:49:20 +0200 Subject: [PATCH] My bad, fix merge --- .../org/sonar/core/plugins/PluginClassloaders.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java index 90d42808000..48e18678b2e 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java +++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java @@ -134,10 +134,6 @@ public class PluginClassloaders { throw new SonarException("The plugin " + plugin.getKey() + " is not supported with Java " + SystemUtils.JAVA_VERSION_TRIMMED, e); } catch (Throwable e) { - // SONAR-3688 - // Throwable is explicitely caught instead of Exception in order to log the plugins - // that are compiled for Java > 5. In such case java.lang.UnsupportedClassVersionError - // is raised. throw new SonarException("Fail to build the classloader of " + plugin.getKey(), e); } } @@ -162,10 +158,6 @@ public class PluginClassloaders { throw new SonarException("The plugin " + plugin.getKey() + " is not supported with Java " + SystemUtils.JAVA_VERSION_TRIMMED, e); } catch (Throwable e) { - // SONAR-3688 - // Throwable is explicitely caught instead of Exception in order to log the plugins - // that are compiled for Java > 5. In such case java.lang.UnsupportedClassVersionError - // is raised. throw new SonarException("Fail to extend the plugin " + plugin.getBasePlugin() + " for " + plugin.getKey(), e); } } @@ -233,11 +225,7 @@ public class PluginClassloaders { throw new SonarException("The plugin " + plugin.getKey() + " is not supported with Java " + SystemUtils.JAVA_VERSION_TRIMMED, e); } catch (Throwable e) { - // SONAR-3688 - // Throwable is explicitely caught instead of Exception in order to log the plugins - // that are compiled for Java > 5. In such case java.lang.UnsupportedClassVersionError - // is raised. - throw new SonarException("Fail to load plugin " + metadata.getKey(), e); + throw new SonarException("Fail to load plugin " + plugin.getKey(), e); } } -- 2.39.5