Release weblogger instance which has been used during initialization (it brings ThreadLocal leak)
git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1708079 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
index 83de9e7..39bbc8c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
@@ -24,6 +24,8 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+
+import org.apache.roller.weblogger.business.Weblogger;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -153,17 +155,24 @@
buf.append("\n--------------------------------------------------------------");
log.info(buf.toString());
} else {
+ Weblogger weblogger = null;
+
try {
// trigger bootstrapping process
WebloggerFactory.bootstrap();
// trigger initialization process
- WebloggerFactory.getWeblogger().initialize();
+ weblogger = WebloggerFactory.getWeblogger();
+ weblogger.initialize();
} catch (BootstrapException ex) {
log.fatal("Roller Weblogger bootstrap failed", ex);
} catch (WebloggerException ex) {
log.fatal("Roller Weblogger initialization failed", ex);
+ } finally {
+ if (weblogger != null) {
+ weblogger.release();
+ }
}
}
