Author: rmannibucau
Date: Sun Nov 11 19:13:49 2012
New Revision: 1408087

URL: http://svn.apache.org/viewvc?rev=1408087&view=rev
Log:
oops MDB itest session close operation was a bit too much aggressive

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
 Sun Nov 11 19:13:49 2012
@@ -140,6 +140,7 @@ public class StatefulContainer implement
                     Method method = 
businessLocal.getMethod(removeMethod.getName(), 
removeMethod.getParameterTypes());
                     methods.put(method, MethodType.REMOVE);
                 } catch (NoSuchMethodException thatsFine) {
+                    // no-op
                 }
             }
 
@@ -148,6 +149,7 @@ public class StatefulContainer implement
                     Method method = 
businessRemote.getMethod(removeMethod.getName(), 
removeMethod.getParameterTypes());
                     methods.put(method, MethodType.REMOVE);
                 } catch (NoSuchMethodException thatsFine) {
+                    // no-op
                 }
             }
         }

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -114,11 +114,6 @@ public class AnnotatedFieldInjectionMdbB
         }
     }
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void onMessage(Message message) {
         try {
 //            System.out.println("\n" +

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -36,11 +36,6 @@ public class BasicMdbBean implements Bas
     private static Hashtable allowedOperationsTable = new Hashtable();
     protected MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void setMessageDrivenContext(MessageDrivenContext ctx) throws 
EJBException {
         this.mdbContext = ctx;
         testAllowedOperations("setMessageDrivenContext");

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -56,11 +56,6 @@ public class ContextLookupMdbBean implem
        private MessageDrivenContext mdbContext = null;
     private MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void setMessageDrivenContext(MessageDrivenContext ctx) throws 
EJBException {
         this.mdbContext = ctx;
         try {

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
 Sun Nov 11 19:13:49 2012
@@ -55,11 +55,6 @@ import java.rmi.RemoteException;
 public class ContextLookupMdbPojoBean implements MessageListener {
     private MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public ContextLookupMdbPojoBean() {
         try {
             ConnectionFactory connectionFactory = (ConnectionFactory) new 
InitialContext().lookup("java:comp/env/jms");

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -55,11 +55,6 @@ public class EncMdbBean implements EncMd
        private MessageDrivenContext mdbContext = null;
     private MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void setMessageDrivenContext(MessageDrivenContext ctx) throws 
EJBException {
         this.mdbContext = ctx;
         try {

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -79,11 +79,6 @@ public class FieldInjectionMdbBean imple
     private MessageDrivenContext mdbContext = null;
     private MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void setMessageDrivenContext(MessageDrivenContext ctx) throws 
EJBException {
         this.mdbContext = ctx;
         try {

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -60,11 +60,6 @@ public class InterceptorMdbBean implemen
     @Resource(name="jms", type=javax.jms.QueueConnectionFactory.class)
     private ConnectionFactory connectionFactory;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void onMessage(Message msg) {
         try {
             classLevelBusinessMethodInterception = 
msg.getBooleanProperty("ClassLevelBusinessMethodInterception");

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java?rev=1408087&r1=1408086&r2=1408087&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
 Sun Nov 11 19:13:49 2012
@@ -77,11 +77,6 @@ public class SetterInjectionMdbBean impl
     private MessageDrivenContext mdbContext = null;
     private MdbInvoker mdbInvoker;
 
-    @PreDestroy
-    protected void stop() {
-        mdbInvoker.destroy();
-    }
-
     public void setMessageDrivenContext(MessageDrivenContext ctx) throws 
EJBException {
         this.mdbContext = ctx;
         try {


Reply via email to