Fix memory leaks

diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/I18nManager.java b/sonar-core/src/main/java/org/sonar/core/i18n/I18nManager.java
index ccdc1fffb255e9866df20955562362a23354e276..29d49c24ae906c37d05716f0d79f8a547b94bf5b 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/i18n/I18nManager.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/I18nManager.java
@@ -81,6 +81,12 @@ public class I18nManager implements I18n, ServerExtension, BatchExtension {
     LOG.debug(String.format("Loaded %d properties from l10n bundles", propertyToBundles.size()));
   }
 
+  public void stop() {
+    i18nClassloader=null;
+    propertyToBundles=null;
+    fileContentCache=null;
+  }
+
   public String message(Locale locale, String key, String defaultValue, Object... parameters) {
     String bundleKey = propertyToBundles.get(key);
     String value = null;

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 48e18678b2eaa4797a1d77f2e3e311038bbf1977..a5aaf015c3d42d4c7ad99fb2b73cf54df302b60d 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
@@ -240,7 +240,8 @@ public class PluginClassloaders {
       } catch (Exception e) {
         // Ignore
       }
-      world = null;
     }
+    world = null;
+    baseClassloader=null;
   }
 }