From 01ca60047ee914b5d98d0e796bbd13288767dbf4 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Tue, 28 Mar 2023 16:11:36 +0200 Subject: [PATCH] fix: Avoid NPE in destroyProcess call --- .../java_client/service/local/AppiumDriverLocalService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java index b58191ec2..b16570f1e 100644 --- a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java +++ b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java @@ -54,7 +54,6 @@ public final class AppiumDriverLocalService extends DriverService { private static final String URL_MASK = "http://%s:%d/"; private static final Logger LOG = LoggerFactory.getLogger(AppiumDriverLocalService.class); - private static final Pattern LOG_MESSAGE_PATTERN = Pattern.compile("^(.*)\\R"); private static final Pattern LOGGER_CONTEXT_PATTERN = Pattern.compile("^(\\[debug\\] )?\\[(.+?)\\]"); private static final String APPIUM_SERVICE_SLF4J_LOGGER_PREFIX = "appium.service"; private static final Duration DESTROY_TIMEOUT = Duration.ofSeconds(60); @@ -217,7 +216,7 @@ public void stop() { * @return The exit code of the process or zero if the process was not running. */ private int destroyProcess(Duration timeout) { - if (!process.isRunning()) { + if (process == null || !process.isRunning()) { return 0; }