Performance tweaks after profiling HEAD code. Audit interceptor shortcut to avoid calling auditImpl at all when auditing disabled in config.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/audit/AuditComponentImpl.java

@@ -31,6 +31,7 @@ import java.net.UnknownHostException;
 import java.util.Date;
 import java.util.List;
 
+import org.alfresco.repo.audit.model.AuditEntry;
 import org.alfresco.repo.audit.model.TrueFalseUnset;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
@@ -159,6 +160,8 @@ public class AuditComponentImpl implements AuditComponent
     public Object audit(MethodInvocation mi) throws Throwable
     {
         if ((auditFlag.get() == null) || (!auditFlag.get().booleanValue()))
+        {
+            if (auditModel instanceof AuditEntry && ((AuditEntry)auditModel).getEnabled() == TrueFalseUnset.TRUE)
             {
                 boolean auditInternal = (auditModel.getAuditInternalServiceMethods(mi) == TrueFalseUnset.TRUE);
                 try
@@ -238,6 +241,11 @@ public class AuditComponentImpl implements AuditComponent
                 return mi.proceed();
             }
         }
+        else
+        {
+            return mi.proceed();
+        }
+    }
 
     /**
      * Internal audit of a method invocation

source/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java

@@ -222,12 +222,16 @@ public abstract class AuthenticationUtil
      */
     private static String getUserName(Authentication authentication)
     {
-        String username = authentication.getPrincipal().toString();
+        String username;
 
         if (authentication.getPrincipal() instanceof UserDetails)
         {
             username = ((UserDetails) authentication.getPrincipal()).getUsername();
         }
+        else
+        {
+            username = authentication.getPrincipal().toString();
+        }
 
         return username;
     }

source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java

@@ -35,6 +35,7 @@ import org.alfresco.repo.security.permissions.PermissionReference;
 public abstract class AbstractPermissionReference implements PermissionReference
 {
     private int hashcode = 0;
+    private String str = null;
     
     public AbstractPermissionReference()
     {
@@ -69,6 +70,10 @@ public abstract class AbstractPermissionReference implements PermissionReference
     @Override
     public String toString()
     {
-        return getQName()+ "." + getName(); 
+        if (str == null)
+        {
+            str = getQName() + "." + getName();
+        }
+        return str;
     }
 }

source/java/org/alfresco/service/namespace/QName.java

@@ -296,10 +296,6 @@ public final class QName implements QNamePattern, Serializable, Cloneable
         {
             return true;
         }
-        else if (object == null)
-        {
-            return false;
-        }
         if (object instanceof QName)
         {
             QName other = (QName)object;
@@ -307,11 +303,8 @@ public final class QName implements QNamePattern, Serializable, Cloneable
             return (this.localName.equals(other.localName) &&
                     this.namespaceURI.equals(other.namespaceURI));
         }
-        else
-        {
         return false;
     }
-    }
 
     /**
      * Performs a direct comparison between qnames.
@@ -347,7 +340,10 @@ public final class QName implements QNamePattern, Serializable, Cloneable
      */
     public String toString()
     {
-        return NAMESPACE_BEGIN + namespaceURI + NAMESPACE_END + localName;
+        return new StringBuffer(80).append(NAMESPACE_BEGIN)
+                                   .append(namespaceURI)
+                                   .append(NAMESPACE_END)
+                                   .append(localName).toString();
     }