Author: awiner
Date: Wed Jan 10 17:13:01 2007
New Revision: 495073
URL: http://svn.apache.org/viewvc?view=rev&rev=495073
Log:
Put back the call to GlobalConfiguratorImpl.destroy(), since the filter isn't
doing it now
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java?view=diff&rev=495073&r1=495072&r2=495073
==============================================================================
---
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
(original)
+++
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
Wed Jan 10 17:13:01 2007
@@ -18,7 +18,7 @@
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.apache.myfaces.trinidad.config.Configurator;
+import org.apache.myfaces.trinidadinternal.config.GlobalConfiguratorImpl;
/**
* Implementation of the Trinidad Context Listener
@@ -34,12 +34,7 @@
*/
public void contextDestroyed(ServletContextEvent arg0)
{
- // FIXME: why is this here? The filter has to be installed (in
- // a servlet environment, as for this class), and
- // it performs cleanup, so why do we worry about cleaning up here?
- // Configurator config = Configurator.getInstance(null);
- // if (config != null)
- // config.destroy();
+ GlobalConfiguratorImpl.getInstance().destroy();
}
/* (non-Javadoc)
