[jboss-cvs] JBossAS SVN: r61139 - in trunk/ejb3/src: test/org/jboss/ejb3/test/interceptors2 and 1 other directories.

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

Author: wolfc
Date: 2007-03-06 05:04:01 -0500 (Tue, 06 Mar 2007)
New Revision: 61139

Modified:
   trunk/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
   trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
Log:
Merged from branch 4.2

Modified: trunk/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	2007-03-06 09:46:24 UTC (rev 61138)
+++ trunk/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml	2007-03-06 10:04:01 UTC (rev 61139)
@@ -8,6 +8,12 @@
         <session>
             <ejb-name>XMLOnlySLSB</ejb-name>
             <jndi-name>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</jndi-name>
+            
+            <!-- The default is ThreadlocalPool, which could lead to new constructs. Same goes for maxSize. -->
+            <pool-config>
+            	<pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+            	<pool-max-size>1</pool-max-size>
+            </pool-config>
         </session>
    </enterprise-beans>
 </jboss>

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	2007-03-06 09:46:24 UTC (rev 61138)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedClassInterceptor3.java	2007-03-06 10:04:01 UTC (rev 61139)
@@ -44,7 +44,7 @@
    @Resource
    EJBContext ejbCtx;
 
-   static int currentInstance;
+   private static int currentInstance = 0;
    int instance = ++currentInstance;
 
    @AroundInvoke

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	2007-03-06 09:46:24 UTC (rev 61138)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java	2007-03-06 10:04:01 UTC (rev 61139)
@@ -32,6 +32,9 @@
 import javax.ejb.Remote;
 import javax.ejb.Stateless;
 
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.ejb3.StrictMaxPool;
+
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -41,6 +44,8 @@
 @Remote(AnnotatedOnlySLSBRemote.class)
 @Interceptors(AnnotatedClassInterceptor.class)
 @ExcludeDefaultInterceptors
+// The default is ThreadlocalPool, which could lead to new constructs. Same goes for maxSize.
+ at PoolClass(value=StrictMaxPool.class, maxSize=1)
 public class AnnotatedOnlySLSB implements AnnotatedOnlySLSBRemote
 {
    @EJB
@@ -81,14 +86,14 @@
    @PostConstruct
    void postConstruct()
    {
-      System.out.println("AnnotatedOnlySLSB postConstruct");
+      System.out.println("AnnotatedOnlySLSB postConstruct " + this);
       StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
    }
 
    @PreDestroy()
    void preDestroy()
    {
-      System.out.println("AnnotatedOnlySLSB preDestroy!");
+      System.out.println("AnnotatedOnlySLSB preDestroy! " + this);
       StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
    }
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-03-06 09:46:24 UTC (rev 61138)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-03-06 10:04:01 UTC (rev 61139)
@@ -690,7 +690,7 @@
       }
       else
       {
-         assertEquals(0, status.getPostConstructs().size());
+         assertEquals("Number of post constructs", 0, status.getPostConstructs().size());
       }
 
       if (expectPostActivate)