| commit | 5497008010ba730dc1390a8efbfe5a703ba35aa2 | [log] [tgz] |
|---|---|---|
| author | Bernd Bohmann <bommel@apache.org> | Sat Apr 08 03:42:33 2017 +0000 |
| committer | Bernd Bohmann <bommel@apache.org> | Sat Apr 08 03:42:33 2017 +0000 |
| tree | 7cfadd1ee9c811b7997a28d48c7b2a2e09465c89 | |
| parent | 1f5be2e98fc1b0e8e7e7fc223089cc3609cc6dad [diff] |
(TRINIDAD-2465) Memory Leak on redeploy fixed checkstyle
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java index aa27a8e..d655e0c 100644 --- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java +++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
@@ -88,15 +88,16 @@ * @return a GlobalConfigurator or <code>null</code> is one was unable to be obtained. */ - static public final void releaseInstance(){ - final ClassLoader loader = Thread.currentThread().getContextClassLoader(); + static public final void releaseInstance() + { + final ClassLoader loader = Thread.currentThread().getContextClassLoader(); if (loader == null) { _LOG.severe("CANNOT_FIND_CONTEXT_CLASS_LOADER"); - return; - } - synchronized (_CONFIGURATORS) + return; + } + synchronized (_CONFIGURATORS) { GlobalConfiguratorImpl config = _CONFIGURATORS.remove(loader); _LOG.fine("GlobalConfigurator has been removed.");
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java index 58e89c3..d3042f8 100644 --- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java +++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
@@ -39,7 +39,7 @@ { RequestContext.releaseApplicationState(); GlobalConfiguratorImpl.getInstance().destroy(); - GlobalConfiguratorImpl.getInstance().releaseInstance(); + GlobalConfiguratorImpl.getInstance().releaseInstance(); } /* (non-Javadoc)