[jboss-cvs] JBossAS SVN: r59917 - in trunk/ejb3/src/main/org/jboss: ejb3 and 1 other directory.

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

Author: wolfc
Date: 2007-01-22 09:01:53 -0500 (Mon, 22 Jan 2007)
New Revision: 59917

Modified:
   trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-841: Only allowing Pool in PoolClass annotation

Modified: trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-01-22 13:57:21 UTC (rev 59916)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-01-22 14:01:53 UTC (rev 59917)
@@ -26,6 +26,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.jboss.ejb3.Pool;
+
 /**
  * Annotation for specifying the pool class to manage thread pooling for a bean
  *
@@ -36,7 +38,7 @@
 @Target({ElementType.TYPE})
 public @interface PoolClass
 {
-   Class value();
+   Class<? extends Pool> value();
    int maxSize() default 30;
    long timeout()default Long.MAX_VALUE;
 }

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-01-22 13:57:21 UTC (rev 59916)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-01-22 14:01:53 UTC (rev 59917)
@@ -540,10 +540,10 @@
    public void initializePool() throws Exception
    {
       PoolClass poolClass = (PoolClass) resolveAnnotation(PoolClass.class);
-      Class poolClazz = poolClass.value();
+      Class<? extends Pool> poolClazz = poolClass.value();
       int maxSize = poolClass.maxSize();
       long timeout = poolClass.timeout();
-      pool = (Pool) poolClazz.newInstance();
+      pool = poolClazz.newInstance();
       pool.initialize(this, beanContextClass, clazz, maxSize, timeout);
 
       resolveInjectors();