Author: remm Date: Fri Dec 9 08:42:23 2005 New Revision: 355530 URL: http://svn.apache.org/viewcvs?rev=355530&view=rev Log: - Remove a static log that I forgot about earlier.
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java?rev=355530&r1=355529&r2=355530&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java Fri Dec 9 08:42:23 2005 @@ -63,10 +63,6 @@ private HashMap objectCache; - private static org.apache.commons.logging.Log sysLog= - org.apache.commons.logging.LogFactory.getLog( ApplicationContextFacade.class ); - - // ----------------------------------------------------------- Constructors @@ -486,22 +482,18 @@ throws Throwable { Throwable realException; - - if (sysLog.isDebugEnabled()) { - sysLog.debug("ApplicationContextFacade." + methodName, ex); - } - - if (ex instanceof PrivilegedActionException) { + + if (ex instanceof PrivilegedActionException) { ex = ((PrivilegedActionException) ex).getException(); - } - + } + if (ex instanceof InvocationTargetException) { realException = - ((InvocationTargetException) ex).getTargetException(); + ((InvocationTargetException) ex).getTargetException(); } else { realException = ex; } - + throw realException; } } Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java?rev=355530&r1=355529&r2=355530&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java Fri Dec 9 08:42:23 2005 @@ -46,9 +46,7 @@ final class ApplicationFilterConfig implements FilterConfig, Serializable { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( ApplicationFilterConfig.class ); - + // ----------------------------------------------------------- Constructors @@ -248,12 +246,11 @@ if (this.filter != null){ if( System.getSecurityManager() != null) { try{ - SecurityUtil.doAsPrivilege("destroy", - filter); - SecurityUtil.remove(filter); + SecurityUtil.doAsPrivilege("destroy", filter); } catch(java.lang.Exception ex){ - log.error("ApplicationFilterConfig.doAsPrivilege", ex); + context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex); } + SecurityUtil.remove(filter); } else { filter.destroy(); } @@ -290,12 +287,11 @@ if (this.filter != null){ if( System.getSecurityManager() != null) { try{ - SecurityUtil.doAsPrivilege("destroy", - filter); - SecurityUtil.remove(filter); + SecurityUtil.doAsPrivilege("destroy", filter); } catch(java.lang.Exception ex){ - log.error("ApplicationFilterConfig.doAsPrivilege", ex); + context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex); } + SecurityUtil.remove(filter); } else { filter.destroy(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]