Merge branch 'main' into patch-1

quarkusio · Sep 21, 2022 · 69eec03 · 69eec03
2 parents 6e7aae2 + 2c06dde
commit 69eec03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java
@@ -165,6 +165,6 @@ public void includeAsSysProps(Map<String, String> systemProps) {
 
     @Override
     public void close() {
-        quarkusProcess.destroy();
+        LauncherUtil.destroyProcess(quarkusProcess);
     }
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java
@@ -267,6 +267,6 @@ public void includeAsSysProps(Map<String, String> systemProps) {
 
     @Override
     public void close() {
-        quarkusProcess.destroy();
+        LauncherUtil.destroyProcess(quarkusProcess);
     }
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java b/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java
@@ -110,7 +110,7 @@ private static void ensureProcessIsAlive(Process quarkusProcess) {
      * Try to destroy the process normally a few times
      * and resort to forceful destruction if necessary
      */
-    private static void destroyProcess(Process quarkusProcess) {
+    static void destroyProcess(Process quarkusProcess) {
         quarkusProcess.destroy();
         int i = 0;
         while (i++ < 10) {