Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
Fixes a bug where Gradle daemon would keep a terminated instance of A…
Browse files Browse the repository at this point in the history
…DB causing it to be completely unusable
  • Loading branch information
Janusz Baginski committed Nov 23, 2023
1 parent 482f1e0 commit 16636c3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fork-runner/src/main/java/com/shazam/fork/Fork.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import static com.shazam.fork.injector.ConfigurationInjector.setConfiguration;
import static com.shazam.fork.injector.ForkRunnerInjector.forkRunner;
import static com.shazam.fork.injector.system.AdbInjector.adb;
import static com.shazam.fork.injector.system.AdbInjector.releaseAdb;
import static com.shazam.fork.utils.Utils.millisSinceNanoTime;
import static java.lang.System.nanoTime;
import static org.apache.commons.io.FileUtils.deleteDirectory;
Expand Down Expand Up @@ -50,7 +50,7 @@ public boolean run() {
} finally {
long duration = millisSinceNanoTime(startOfTestsMs);
logger.info(formatPeriod(0, duration, "'Total time taken:' H 'hours' m 'minutes' s 'seconds'"));
adb().terminate();
releaseAdb();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,22 @@
import static com.shazam.fork.injector.ConfigurationInjector.configuration;

public class AdbInjector {
private static final Adb ADB = new Adb(configuration().getAndroidSdk());
private static Adb ADB;

private AdbInjector() {}
private AdbInjector() {
}

public static Adb adb() {
if (ADB == null) {
ADB = new Adb(configuration().getAndroidSdk());
}
return ADB;
}

public static void releaseAdb() {
if (ADB != null) {
ADB.terminate();
}
ADB = null;
}
}

0 comments on commit 16636c3

Please sign in to comment.