From 6d245e23aa6bbd6bf021e4a4235bb3d88618dfef Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 1 Nov 2012 22:05:48 +0100
Subject: [PATCH] Fix memory leaks

---
 .../src/main/java/org/sonar/core/i18n/I18nManager.java      | 6 ++++++
 .../java/org/sonar/core/plugins/PluginClassloaders.java     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 ccdc1fffb25..29d49c24ae9 100644
--- 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 48e18678b2e..a5aaf015c3d 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
@@ -240,7 +240,8 @@ public class PluginClassloaders {
       } catch (Exception e) {
         // Ignore
       }
-      world = null;
     }
+    world = null;
+    baseClassloader=null;
   }
 }
-- 
2.39.5