[jboss-cvs] JBossAS SVN: r63062 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-15 16:17:03 -0400 (Tue, 15 May 2007)
New Revision: 63062

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java
Log:
default audit context when a particular audit config missing for a security domain

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java	2007-05-15 20:11:04 UTC (rev 63061)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java	2007-05-15 20:17:03 UTC (rev 63062)
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.jboss.logging.Logger;
 import org.jboss.security.audit.AuditContext;
 import org.jboss.security.audit.AuditEvent;
 import org.jboss.security.audit.AuditManager;
@@ -29,6 +30,8 @@
  */
 public class JBossAuditManager implements AuditManager
 {
+   private static Logger log = Logger.getLogger(JBossAuditManager.class);
+   
    private static ConcurrentHashMap<String,AuditContext> contexts = new ConcurrentHashMap<String,AuditContext>();
    
    private static AuditContext defaultContext = null;
@@ -56,22 +59,32 @@
          if(ap != null)
          {
             AuditInfo ai = ap.getAuditInfo();
-            ClassLoader cl = SecurityActions.getContextClassLoader();
-            List<AuditProviderEntry> list = ai.get();
-            for(AuditProviderEntry ape:list)
-            {
-               String pname = ape.getName();
-               try
+            if(ai != null)
+            { 
+               ClassLoader cl = SecurityActions.getContextClassLoader();
+               List<AuditProviderEntry> list = ai.get();
+               for(AuditProviderEntry ape:list)
                {
-                  ac.addProvider((AuditProvider) SecurityActions.loadClass(pname).newInstance());
+                  String pname = ape.getName();
+                  try
+                  {
+                     ac.addProvider((AuditProvider) SecurityActions.loadClass(pname).newInstance());
+                  }
+                  catch (Exception e)
+                  {
+                     throw new RuntimeException(e);
+                  } 
                }
-               catch (Exception e)
-               {
-                  throw new RuntimeException(e);
-               } 
             }
          }
       }
+      if(ac == null)
+      {
+         if(log.isTraceEnabled())
+            log.trace("No audit Context found for "+securityDomain+" ; defaulting to"
+                  + " audit context for other");
+         ac = defaultContext;
+      }
       return ac;
    }