You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2011/05/25 15:52:50 UTC
svn commit: r1127534 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core:
singleton/SingletonContainer.java stateless/StatelessContainer.java
Author: andygumbrecht
Date: Wed May 25 13:52:49 2011
New Revision: 1127534
URL: http://svn.apache.org/viewvc?rev=1127534&view=rev
Log:
Remove timer before undeploy.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java?rev=1127534&r1=1127533&r2=1127534&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java Wed May 25 13:52:49 2011
@@ -130,12 +130,14 @@ public class SingletonContainer implemen
} finally{
ThreadContext.exit(old);
}
- instanceManager.undeploy(beanContext);
+
EjbTimerService timerService = beanContext.getEjbTimerService();
if (timerService != null) {
timerService.stop();
}
-
+
+ instanceManager.undeploy(beanContext);
+
synchronized (this) {
String id = (String) beanContext.getDeploymentID();
beanContext.setContainer(null);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=1127534&r1=1127533&r2=1127534&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Wed May 25 13:52:49 2011
@@ -115,12 +115,14 @@ public class StatelessContainer implemen
}
public void undeploy(BeanContext beanContext) {
- instanceManager.undeploy(beanContext);
+
EjbTimerService timerService = beanContext.getEjbTimerService();
if (timerService != null) {
timerService.stop();
}
-
+
+ instanceManager.undeploy(beanContext);
+
synchronized (this) {
String id = (String) beanContext.getDeploymentID();
beanContext.setContainer(null);