[jboss-cvs] JBossAS SVN: r74705 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: ALRubinger
Date: 2008-06-17 14:00:14 -0400 (Tue, 17 Jun 2008)
New Revision: 74705

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
Log:
[JBMETA-58] Don't direct accessors of transient values to wrapped object

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-06-17 17:30:12 UTC (rev 74704)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-06-17 18:00:14 UTC (rev 74705)
@@ -639,45 +639,33 @@
       // Initialize the Default JNDI Binding Policy
       DefaultJndiBindingPolicy policy = null;
       
-      // If Deployment Summary is defined
-      if (dsummary != null)
+      try
       {
-         try
+         // Initialize a CL
+         ClassLoader loader = null;
+         
+         // Attempt to obtain CL from deployment summary
+         if (dsummary != null)
          {
-            /*
-             * Create a JNDI Policy from the Deployment Summary
-             */ 
-            
-            // Obtain the JNDI Policy Class Name
-            String jndiPolicyClassName = this.getJndiBindingPolicy();
-            if (jndiPolicyClassName != null && jndiPolicyClassName.trim().equals(""))
-            {
-               jndiPolicyClassName = null;
-            }
-            
-            // Get the CL
-            ClassLoader loader = dsummary.getLoader();
-            
-            // Load the Class
-            Class<? extends DefaultJndiBindingPolicy> jndiPolicyClass = null;
-            if (jndiPolicyClassName != null)
-            {
-               Class<?> clazz = loader.loadClass(jndiPolicyClassName);
-               assert DefaultJndiBindingPolicy.class.isAssignableFrom(clazz) : "Specified " + jndiPolicyClassName
-                     + " is not of expected type " + DefaultJndiBindingPolicy.class.getName();
-               jndiPolicyClass = (Class<? extends DefaultJndiBindingPolicy>) clazz;
-            }
-            
-            // Create Policy
-            policy = createPolicy(loader, jndiPolicyClass);
+            dsummary.getLoader();
          }
-         catch (Exception e)
+         
+         // Fall back on TCL if there's no DeploymentSummary
+         if (loader == null)
          {
+            loader = Thread.currentThread().getContextClassLoader();
          }
+
+         // Create Policy, falling back on the default policy if specified
+         policy = this.createPolicy(loader, defaultPolicy == null ? null : defaultPolicy.getClass());
       }
+      catch (Exception e)
+      {
+         throw new RuntimeException("Error in creating " + DefaultJndiBindingPolicy.class.getSimpleName(),e);
+      }
+      
+      // If there's still no policy
       if (policy == null)
-         policy = defaultPolicy;
-      if (policy == null)
       {
          // Use the metadata default binding policy
          policy = new BasicJndiBindingPolicy(baseJndiName);

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2008-06-17 17:30:12 UTC (rev 74704)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2008-06-17 18:00:14 UTC (rev 74705)
@@ -226,14 +226,14 @@
    @Override
    public DeploymentSummary getDeploymentSummary()
    {
-      DeploymentSummary summary = primary.getDeploymentSummary();
+      DeploymentSummary summary = super.getDeploymentSummary();
       return summary;
    }
 
    @Override
    public String getJndiBindingPolicy()
    {
-      String policy = primary.getJndiBindingPolicy();
+      String policy = super.getJndiBindingPolicy();
       if(policy == null && defaults != null)
          policy = defaults.getJndiBindingPolicy();
       return policy;