[jboss-cvs] JBossAS SVN: r111228 - in trunk: server/src/main/java/org/jboss/ejb/plugins and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2011-04-21 02:57:03 -0400 (Thu, 21 Apr 2011)
New Revision: 111228

Modified:
   trunk/profileservice/src/main/java/org/jboss/profileservice/remoting/
   trunk/profileservice/src/main/java/org/jboss/profileservice/remoting/ProfileServiceInvocationHandler.java
   trunk/server/src/main/java/org/jboss/ejb/plugins/
   trunk/server/src/main/java/org/jboss/ejb/plugins/RunAsSecurityInterceptor.java
   trunk/server/src/main/java/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
Log:
JBAS-9376 (Performance) Fix trace logging in security interceptors


Property changes on: trunk/profileservice/src/main/java/org/jboss/profileservice/remoting
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/JBPAPP_5_1/profileservice/src/main/org/jboss/profileservice/remoting:111209

Modified: trunk/profileservice/src/main/java/org/jboss/profileservice/remoting/ProfileServiceInvocationHandler.java
===================================================================
--- trunk/profileservice/src/main/java/org/jboss/profileservice/remoting/ProfileServiceInvocationHandler.java	2011-04-21 06:16:20 UTC (rev 111227)
+++ trunk/profileservice/src/main/java/org/jboss/profileservice/remoting/ProfileServiceInvocationHandler.java	2011-04-21 06:57:03 UTC (rev 111228)
@@ -117,6 +117,9 @@
 
       // Set the SecurityManagement on the context
       SecurityActions.setSecurityManagement(newSC, securityManagement);
-      log.trace("establishSecurityIdentity:SecCtx="+SecurityActions.trace(newSC));
+      if (log.isTraceEnabled())
+      {
+         log.trace("establishSecurityIdentity:SecCtx="+SecurityActions.trace(newSC));
+      }
    }
 }


Property changes on: trunk/server/src/main/java/org/jboss/ejb/plugins
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins:111209

Modified: trunk/server/src/main/java/org/jboss/ejb/plugins/RunAsSecurityInterceptor.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/plugins/RunAsSecurityInterceptor.java	2011-04-21 06:16:20 UTC (rev 111227)
+++ trunk/server/src/main/java/org/jboss/ejb/plugins/RunAsSecurityInterceptor.java	2011-04-21 06:57:03 UTC (rev 111228)
@@ -110,8 +110,11 @@
       {
          securityDomain = securityManager.getSecurityDomain();
       }
-      log.trace("Bean:"+ container.getServiceName() + " securityDomain="+securityDomain 
+      if (log.isTraceEnabled())
+      {
+         log.trace("Bean:"+ container.getServiceName() + " securityDomain="+securityDomain
             + " isInvokeMethod="+ isInvokeMethod);
+      }
       //Establish a security context if one is missing for Run-As push
       if(SecurityActions.getSecurityContext() == null)
       {
@@ -126,7 +129,10 @@
       SecurityActions.pushRunAsIdentity(runAsIdentity);  
       SecurityActions.pushCallerRunAsIdentity(runAsIdentity);  
 
-      log.trace("Security Context = " + SecurityActions.trace(SecurityActions.getSecurityContext()));
+      if (log.isTraceEnabled())
+      {
+         log.trace("Security Context = " + SecurityActions.trace(SecurityActions.getSecurityContext()));
+      }
       try
       {
          if(isInvokeMethod)

Modified: trunk/server/src/main/java/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java	2011-04-21 06:16:20 UTC (rev 111227)
+++ trunk/server/src/main/java/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java	2011-04-21 06:57:03 UTC (rev 111228)
@@ -70,7 +70,10 @@
       }
       catch (Exception e)
       {
-         log.trace("Exception in creating TimedObject method:",e);
+         if (log.isTraceEnabled())
+         {
+            log.trace("Exception in creating TimedObject method:",e);
+         }
       } 
    }
 
@@ -98,8 +101,11 @@
          else
             return getNext().invokeHome(mi);
       }   
-      
-      log.trace("process:isInvoke="+isInvoke + " bean="+ container.getServiceName());
+
+      if (log.isTraceEnabled())
+      {
+         log.trace("process:isInvoke="+isInvoke + " bean="+ container.getServiceName());
+      }
       SecurityIdentity si = null;
       String incomingDomain = null;
       Method m = mi.getMethod();
@@ -107,7 +113,10 @@
       //For local ejb invocations
       if(mi.isLocal() && !isEjbTimeOutMethod)
       {
-         log.trace("True mi.isLocal() && !isEjbTimeOutMethod");
+         if (log.isTraceEnabled())
+         {
+            log.trace("True mi.isLocal() && !isEjbTimeOutMethod");
+         }
          //Cache the security context
          SecurityContext sc = SecurityActions.getSecurityContext();
          if(sc != null)
@@ -119,14 +128,20 @@
          SecurityActions.setSecurityManagement(sc, container.getSecurityManagement());
          // set the container's security domain in the security context
          SecurityActions.setSecurityDomain(sc, this.securityDomain);
-         
-         log.trace("SecurityIdentity="+SecurityActions.trace(si));
+
+         if (log.isTraceEnabled())
+         {
+            log.trace("SecurityIdentity="+SecurityActions.trace(si));
+         }
          //Set the security context on the invocation
          mi.setSecurityContext(sc); 
       }
       else
       {
-         log.trace("False mi.isLocal() && !isEjbTimeOutMethod");
+         if (log.isTraceEnabled())
+         {
+            log.trace("False mi.isLocal() && !isEjbTimeOutMethod");
+         }
          establishSecurityContext(mi); 
       } 
       
@@ -135,7 +150,10 @@
          //Establish the run-as on the SC as the caller SC
          SecurityContext currentSC = SecurityActions.getSecurityContext();
          SecurityActions.pushCallerRunAsIdentity(currentSC.getOutgoingRunAs());
-         log.trace("Going to the SecurityInterceptor with SC="+SecurityActions.trace(currentSC));
+         if (log.isTraceEnabled())
+         {
+            log.trace("Going to the SecurityInterceptor with SC="+SecurityActions.trace(currentSC));
+         }
          if(isInvoke)
             return getNext().invoke(mi);
          else
@@ -148,7 +166,10 @@
             SecurityActions.setSecurityIdentity(SecurityActions.getSecurityContext(), si);
          if(mi.isLocal() && incomingDomain != null)
         	 SecurityActions.setSecurityDomain(SecurityActions.getSecurityContext(), incomingDomain);
-         log.trace("Exit process():isInvoke="+isInvoke);
+         if (log.isTraceEnabled())
+         {
+            log.trace("Exit process():isInvoke="+isInvoke);
+         }
       } 
    }
    
@@ -173,6 +194,9 @@
       }
       //Set the SecurityManagement on the context
       SecurityActions.setSecurityManagement(newSC, container.getSecurityManagement());
-      log.trace("establishSecurityIdentity:SecCtx="+SecurityActions.trace(newSC));
+      if (log.isTraceEnabled())
+      {
+         log.trace("establishSecurityIdentity:SecCtx="+SecurityActions.trace(newSC));
+      }
    }
 }