From 6d24a333cc5cab7770917e5d103ef198c81bae36 Mon Sep 17 00:00:00 2001
From: Enrique Gonzalez Martinez <Enrique.Gonzalez.Martinez1@ibm.com>
Date: Fri, 20 Oct 2023 16:44:38 +0200
Subject: [PATCH] [incubator-kie-issues-597-orphans] potential fix for orphans

---
 .../org/jbpm/process/core/timer/impl/GlobalTimerService.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java
index 2daa6b2cfd..412f03dc60 100644
--- a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java
+++ b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java
@@ -160,8 +160,11 @@ public boolean removeJob(JobHandle jobHandle) {
             return unregisterJobHandle(jobHandle);
         } else {
         	logger.debug("No match for job handle {} within handles of session {}", jobHandle, sessionId);
-            return false;
+        	// even if we don't have this we need to trigger the deletion as we could be in cluster env and not 
+        	// having the info in here
+            return unregisterJobHandle(jobHandle);
         }
+
     }
 
     private GlobalJobHandle registerJobHandle (Job job, JobContext ctx, Trigger trigger) {