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

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

Author: emuckenhuber
Date: 2008-06-23 09:52:55 -0400 (Mon, 23 Jun 2008)
New Revision: 74902

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
Log:
finally clear EJBNameThreadLocal.ejbName

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java	2008-06-23 13:03:00 UTC (rev 74901)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractEnterpriseBeanProcessor.java	2008-06-23 13:52:55 UTC (rev 74902)
@@ -85,62 +85,68 @@
 
       EjbNameThreadLocal.ejbName.set(beanMetaData.getEjbName());
 
-      JBossEnvironmentRefsGroupMetaData env = (JBossEnvironmentRefsGroupMetaData) beanMetaData.getJndiEnvironmentRefsGroup();
-      if(env == null)
+      try
       {
-         env = new JBossEnvironmentRefsGroupMetaData();
-         beanMetaData.setJndiEnvironmentRefsGroup(env);
-      }
-      super.process(env, beanClass);
+         JBossEnvironmentRefsGroupMetaData env = (JBossEnvironmentRefsGroupMetaData) beanMetaData.getJndiEnvironmentRefsGroup();
+         if(env == null)
+         {
+            env = new JBossEnvironmentRefsGroupMetaData();
+            beanMetaData.setJndiEnvironmentRefsGroup(env);
+         }
+         super.process(env, beanClass);
+   
+         
+         if(ejbJarMetaData.getEnterpriseBeans() == null)
+            ejbJarMetaData.setEnterpriseBeans(new JBossEnterpriseBeansMetaData());
+         
+         ejbJarMetaData.getEnterpriseBeans().add(beanMetaData);
+         processClass(beanMetaData, beanClass);
+   
+         JBossAssemblyDescriptorMetaData assembly = ejbJarMetaData.getAssemblyDescriptor();
+         if(assembly == null)
+         {
+            assembly = new JBossAssemblyDescriptorMetaData();
+            ejbJarMetaData.setAssemblyDescriptor(assembly);
+         }
+         // @DeclareRoles
+         SecurityRolesMetaData securityRoles = assembly.getSecurityRoles();
+         if(securityRoles == null)
+         {
+            securityRoles = new SecurityRolesMetaData();
+            assembly.setSecurityRoles(securityRoles);
+         }
+         super.processClass(securityRoles, beanClass);
+         // @DenyAll
+         ExcludeListMetaData excludes = assembly.getExcludeList();
+         if(excludes == null)
+         {
+            excludes = new ExcludeListMetaData();
+            assembly.setExcludeList(excludes);
+         }
+         super.processClass(excludes, beanClass);
+   
+         // @RolesAllowed, @PermitAll
+         MethodPermissionsMetaData permissions = assembly.getMethodPermissions();
+         if(permissions == null)
+         {
+            permissions = new MethodPermissionsMetaData();
+            assembly.setMethodPermissions(permissions);
+         }
+         super.processClass(permissions, beanClass);
+   
+         // @Interceptors
+         InterceptorBindingsMetaData interceptors = assembly.getInterceptorBindings();
+         if(interceptors == null)
+         {
+            interceptors = new InterceptorBindingsMetaData();
+            assembly.setInterceptorBindings(interceptors);
+         }
+         super.processClass(interceptors, beanClass);
 
-      
-      if(ejbJarMetaData.getEnterpriseBeans() == null)
-         ejbJarMetaData.setEnterpriseBeans(new JBossEnterpriseBeansMetaData());
-      
-      ejbJarMetaData.getEnterpriseBeans().add(beanMetaData);
-      processClass(beanMetaData, beanClass);
-
-      JBossAssemblyDescriptorMetaData assembly = ejbJarMetaData.getAssemblyDescriptor();
-      if(assembly == null)
-      {
-         assembly = new JBossAssemblyDescriptorMetaData();
-         ejbJarMetaData.setAssemblyDescriptor(assembly);
       }
-      // @DeclareRoles
-      SecurityRolesMetaData securityRoles = assembly.getSecurityRoles();
-      if(securityRoles == null)
+      finally
       {
-         securityRoles = new SecurityRolesMetaData();
-         assembly.setSecurityRoles(securityRoles);
+         EjbNameThreadLocal.ejbName.set(null);
       }
-      super.processClass(securityRoles, beanClass);
-      // @DenyAll
-      ExcludeListMetaData excludes = assembly.getExcludeList();
-      if(excludes == null)
-      {
-         excludes = new ExcludeListMetaData();
-         assembly.setExcludeList(excludes);
-      }
-      super.processClass(excludes, beanClass);
-
-      // @RolesAllowed, @PermitAll
-      MethodPermissionsMetaData permissions = assembly.getMethodPermissions();
-      if(permissions == null)
-      {
-         permissions = new MethodPermissionsMetaData();
-         assembly.setMethodPermissions(permissions);
-      }
-      super.processClass(permissions, beanClass);
-
-      // @Interceptors
-      InterceptorBindingsMetaData interceptors = assembly.getInterceptorBindings();
-      if(interceptors == null)
-      {
-         interceptors = new InterceptorBindingsMetaData();
-         assembly.setInterceptorBindings(interceptors);
-      }
-      super.processClass(interceptors, beanClass);
-
-      EjbNameThreadLocal.ejbName.set(null);
    }
 }