You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/07/01 21:06:07 UTC
svn commit: r1142027 -
/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
Author: gawor
Date: Fri Jul 1 19:06:06 2011
New Revision: 1142027
URL: http://svn.apache.org/viewvc?rev=1142027&view=rev
Log:
GERONIMO-6042: do wab deploy under ConfigurationManager lock - to ensure the locks are obtained in the same order
Modified:
geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java?rev=1142027&r1=1142026&r2=1142027&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (original)
+++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Fri Jul 1 19:06:06 2011
@@ -118,13 +118,15 @@ public class WebApplication implements R
public void run() {
scheduled.set(false);
synchronized (scheduled) {
- synchronized (running) {
- running.set(true);
- try {
- doRun();
- } finally {
- running.set(false);
- running.notifyAll();
+ synchronized (extender.getConfigurationManager()) {
+ synchronized (running) {
+ running.set(true);
+ try {
+ doRun();
+ } finally {
+ running.set(false);
+ running.notifyAll();
+ }
}
}
}