svn commit: r1222310 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

[rmannibucau]

Author: rmannibucau
Date: Thu Dec 22 16:10:49 2011
New Revision: 1222310

URL: http://svn.apache.org/viewvc?rev=1222310&view=rev
Log:
synchronizing some destroy methods

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1222310&r1=1222309&r2=1222310&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Thu Dec 22 16:10:49 2011
@@ -979,7 +979,7 @@ public class Assembler extends Assembler
         return deployments;
     }
 
-    public void destroy() {
+    public synchronized void destroy() {
 
         try {
             EjbTimerServiceImpl.shutdown();
@@ -1041,7 +1041,7 @@ public class Assembler extends Assembler
         SystemInstance.reset();
     }
 
-    public void destroyApplication(String filePath) throws UndeployException, 
NoSuchApplicationException {
+    public synchronized void destroyApplication(String filePath) throws 
UndeployException, NoSuchApplicationException {
         AppInfo appInfo = deployedApplications.remove(filePath);
         if (appInfo == null) {
             throw new NoSuchApplicationException(filePath);
@@ -1049,7 +1049,7 @@ public class Assembler extends Assembler
         destroyApplication(appInfo);
     }
 
-    public void destroyApplication(AppContext appContext) throws 
UndeployException {
+    public synchronized void destroyApplication(AppContext appContext) throws 
UndeployException {
         AppInfo appInfo = deployedApplications.remove(appContext.getId());
         if (appInfo == null) {
             throw new IllegalStateException(String.format("Cannot find AppInfo 
for app: %s", appContext.getId()));
@@ -1057,7 +1057,7 @@ public class Assembler extends Assembler
         destroyApplication(appInfo);
     }
 
-    public void destroyApplication(AppInfo appInfo) throws UndeployException {
+    public synchronized void destroyApplication(AppInfo appInfo) throws 
UndeployException {
         deployedApplications.remove(appInfo.path);
         logger.info("destroyApplication.start", appInfo.path);