[jboss-cvs] JBossAS SVN: r67641 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: ALRubinger
Date: 2007-11-30 00:35:11 -0500 (Fri, 30 Nov 2007)
New Revision: 67641

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
[EJBTHREE-1119] Fixes to default the pool implementation in the case @Pool.value is blank or null

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-11-30 05:00:35 UTC (rev 67640)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-11-30 05:35:11 UTC (rev 67641)
@@ -64,6 +64,7 @@
 import org.jboss.aop.util.MethodHashing;
 import org.jboss.ejb3.annotation.Clustered;
 import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.defaults.PoolDefaults;
 import org.jboss.ejb3.deployers.Ejb3Deployer;
 import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
 import org.jboss.ejb3.entity.PersistenceUnitDeployment;
@@ -807,6 +808,12 @@
       if (poolAnnotation == null)
          throw new IllegalStateException("No pool annotation");
       String registeredPoolName = poolAnnotation.value();
+      // EJBTHREE-1119
+      if(registeredPoolName==null||registeredPoolName.trim().equals(""))
+      {
+         // Default the Pool Implementation
+         registeredPoolName = PoolDefaults.POOL_IMPLEMENTATION_THREADLOCAL;
+      }
       int maxSize = poolAnnotation.maxSize();
       long timeout = poolAnnotation.timeout();
       Ejb3Deployer deployer = deployment.getDeployer();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-30 05:00:35 UTC (rev 67640)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-30 05:35:11 UTC (rev 67641)
@@ -104,6 +104,7 @@
 import org.jboss.ejb3.annotation.SerializedConcurrentAccess;
 import org.jboss.ejb3.annotation.Service;
 import org.jboss.ejb3.annotation.TransactionTimeout;
+import org.jboss.ejb3.annotation.defaults.PoolDefaults;
 import org.jboss.ejb3.annotation.impl.CacheImpl;
 import org.jboss.ejb3.annotation.impl.ClusteredImpl;
 import org.jboss.ejb3.annotation.impl.ConsumerImpl;
@@ -1368,6 +1369,13 @@
 
          if (config.getValue() != null && !config.getValue().trim().equals(""))
             poolAnnotation.setValue(config.getValue());
+         
+         // EJBTHREE-1119
+         if(config.getValue()==null || config.getValue().trim().equals(""))
+         {
+            // Set default implementation to Threadlocal
+            poolAnnotation.setValue(PoolDefaults.POOL_IMPLEMENTATION_THREADLOCAL);
+         }
 
          if (config.getMaxSize() != null)
             poolAnnotation.setMaxSize(config.getMaxSize());