Merge pull request #6019 from jfdenise/WFCORE-6069

Fix for WFCORE-6069, PermissionsDeploymentTestCase fails intermittently on Windows - Bootable JAR Job
wildfly · Jun 3, 2024 · 51fd85f · 51fd85f
2 parents df0250f + 76a7472
commit 51fd85f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/BootableJar.java b/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/BootableJar.java
@@ -446,13 +446,14 @@ public void run() {
             executor.shutdown();
             try {
                 if (!executor.awaitTermination(environment.getTimeout(), TimeUnit.SECONDS)) {
-                    // For some reason we've timed out. The deletion should likely be executing, but let's force it to
-                    // be safe.
-                    cleaner.cleanup();
+                    // For some reason we've timed out. The deletion should likely be executing.
+                    // We can't start a new cleanup to force it. On Windows we would have the side effect to have 2 cleaner processes to
+                    // be executed, with the risk that a new installation has been installed and the new cleaner cleaning the new installation
+                    log.cleanupTimeout(environment.getTimeout(), environment.getJBossHome());
                 }
-            } catch (IOException | InterruptedException e) {
-                // Possibly already logged, but we should log again to be safe
-                log.failedToStartCleanupProcess(e, environment.getJBossHome());
+            } catch (InterruptedException e) {
+                // The task has been interrupted, leaving
+                log.cleanupTimeout(environment.getTimeout(), environment.getJBossHome());
             }
         }