[Jboss-svn-commits] JBL Code SVN: r1755 - trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-12-09 11:34:08 -0500 (Fri, 09 Dec 2005)
New Revision: 1755

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java
Log:
- Remove useless static loggers.

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java	2005-12-09 16:26:35 UTC (rev 1754)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java	2005-12-09 16:34:08 UTC (rev 1755)
@@ -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: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java	2005-12-09 16:26:35 UTC (rev 1754)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java	2005-12-09 16:34:08 UTC (rev 1755)
@@ -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();
                 }