[JENKINS-11952] Wait for ADB start to complete before starting the em…

…ulator
jenkinsci · Oct 20, 2014 · 3cbe818 · 3cbe818
1 parent 4572745
commit 3cbe818
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java b/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java
@@ -302,6 +302,7 @@ private Environment doSetUp(final AbstractBuild<?, ?> build, final Launcher laun
         // We manually start the adb-server so that later commands will not have to start it,
         // allowing them to complete faster.
         Proc adbStart = emu.getToolProcStarter(Tool.ADB, "start-server").stdout(logger).start();
+        adbStart.joinWithTimeout(5L, TimeUnit.SECONDS, listener);
 
         // Determine whether we need to create the first snapshot
         final SnapshotState snapshotState;
@@ -347,7 +348,6 @@ private Environment doSetUp(final AbstractBuild<?, ?> build, final Launcher laun
 
         // Give the emulator process a chance to initialise
         Thread.sleep(5 * 1000);
-        adbStart.joinWithTimeout(5L, TimeUnit.SECONDS, listener);
 
         // Check whether a failure was reported on stdout
         if (emulatorOutput.toString().contains("image is used by another emulator")) {