Synchronize on a specific lock in static, rather than our mojo instance.

simpligility · Jun 21, 2011 · e3f9acd · e3f9acd
1 parent 33e52c7
commit e3f9acd
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/com/jayway/maven/plugins/android/AbstractAndroidMojo.java b/src/main/java/com/jayway/maven/plugins/android/AbstractAndroidMojo.java
@@ -378,6 +378,7 @@ public abstract class AbstractAndroidMojo extends AbstractMojo {
      */
     protected List testClasses;
 
+    private static final Object adbLock = new Object();
     private static boolean adbInitialized = false;
 
     /**
@@ -509,14 +510,16 @@ protected File resolveArtifactToFile(Artifact artifact) throws MojoExecutionExce
      * the init call in the library is also synchronized .. just in case.
      * @return
      */
-    private synchronized AndroidDebugBridge initAndroidDebugBridge() {
-        if (!adbInitialized) {
-            AndroidDebugBridge.init(false);
-            adbInitialized = true;
+    private AndroidDebugBridge initAndroidDebugBridge() {
+        synchronized (adbLock) {
+            if (!adbInitialized) {
+                AndroidDebugBridge.init(false);
+                adbInitialized = true;
+            }
+            AndroidDebugBridge androidDebugBridge = AndroidDebugBridge.createBridge();
+            waitUntilConnected(androidDebugBridge);
+            return androidDebugBridge;
         }
-        AndroidDebugBridge androidDebugBridge = AndroidDebugBridge.createBridge();
-        waitUntilConnected(androidDebugBridge);
-        return androidDebugBridge;
     }
 
     /**