[jboss-cvs] JBossAS SVN: r62570 - trunk/server/src/main/org/jboss/deployment/security.

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

Author: anil.saldhana at jboss.com
Date: 2007-04-25 17:59:34 -0400 (Wed, 25 Apr 2007)
New Revision: 62570

Modified:
   trunk/server/src/main/org/jboss/deployment/security/JaccPolicy.java
Log:
externalize creation of policy configuration

Modified: trunk/server/src/main/org/jboss/deployment/security/JaccPolicy.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/JaccPolicy.java	2007-04-25 21:58:57 UTC (rev 62569)
+++ trunk/server/src/main/org/jboss/deployment/security/JaccPolicy.java	2007-04-25 21:59:34 UTC (rev 62570)
@@ -75,13 +75,12 @@
    { 
       try
       {
-         PolicyConfigurationFactory pcf = PolicyConfigurationFactory.getPolicyConfigurationFactory();
-         parentPC = pcf.getPolicyConfiguration(contextID, true);
+         createPolicyConfiguration();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
-         throw new RuntimeException("Cannot initialize policy configuration:",e);
-      } 
+         throw new RuntimeException(e);
+      }
       if(this.standaloneDeployment == Boolean.TRUE)
       {
          try
@@ -143,6 +142,25 @@
    {  
       if(trace)
          log.trace("Linking " + pc + " to parent pc=" +  parentPC);
+      if(pc == null)
+         throw new IllegalArgumentException("pc is null");
+      try
+      {
+         createPolicyConfiguration();
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException(e);
+      }
       parentPC.linkConfiguration(pc); 
    } 
+   
+   private void createPolicyConfiguration() throws PolicyContextException, ClassNotFoundException 
+   {
+      if(parentPC == null)
+      {
+         PolicyConfigurationFactory pcf = PolicyConfigurationFactory.getPolicyConfigurationFactory();
+         parentPC = pcf.getPolicyConfiguration(contextID, true);
+      }
+   }
 }