svn commit: r732796 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java

[db...@apache.org]

Author: dblevins
Date: Thu Jan  8 11:15:25 2009
New Revision: 732796

URL: http://svn.apache.org/viewvc?rev=732796&view=rev
Log:
OPENEJB-986: Stateful Remove exception handling regression
Stateful beans should not be removable while in a transaction (regression is that it was enforced for BMT but not CMT)

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=732796&r1=732795&r2=732796&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Thu Jan  8 11:15:25 2009
@@ -352,8 +352,8 @@
             InterfaceType interfaceType = deploymentInfo.getInterfaceType(callInterface);
             if (interfaceType.isComponent()) {
                 Instance instance = checkedOutInstances.get(primKey);
-                if (instance != null && instance.getBeanTransaction() != null) {
-                    throw new ApplicationException(new RemoveException("A stateful EJB enrolled in a bean-managed transaction can not be removed"));
+                if (instance != null) {
+                    throw new ApplicationException(new RemoveException("A stateful EJB enrolled in a transaction can not be removed"));
                 }
             }