From 2859fc6c87c754db3f4bc1c491cf623e0eb24f32 Mon Sep 17 00:00:00 2001
From: Javier <ftirados@redhat.com>
Date: Sat, 31 Aug 2024 09:52:44 +0200
Subject: [PATCH] [Fix #3642] Removing not stricly needed changes

---
 .../org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java  | 2 +-
 .../process/instance/LightProcessRuntimeServiceProvider.java   | 3 ++-
 .../java/org/jbpm/process/instance/ProcessRuntimeImpl.java     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/kogito-services/src/main/java/org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java b/api/kogito-services/src/main/java/org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java
index 4882740af26..9e104821c49 100644
--- a/api/kogito-services/src/main/java/org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java
+++ b/api/kogito-services/src/main/java/org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java
@@ -37,7 +37,7 @@
  *
  */
 public class DefaultUnitOfWorkManager implements UnitOfWorkManager {
-    private static DefaultUnitOfWorkManager instance = new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory());
+    private static final DefaultUnitOfWorkManager instance = new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory());
     // uses thread local to associate unit of works to execution context/thread
     private ThreadLocal<UnitOfWork> currentUnitOfWork = new ThreadLocal<>();
     // uses pass through unit of work as fallback if no unit of work has been started
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightProcessRuntimeServiceProvider.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightProcessRuntimeServiceProvider.java
index f243afec74f..2f551cb2028 100644
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightProcessRuntimeServiceProvider.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightProcessRuntimeServiceProvider.java
@@ -22,6 +22,7 @@
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 import org.kie.kogito.services.identity.NoOpIdentityProvider;
 import org.kie.kogito.services.signal.DefaultSignalManagerHub;
+import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
 
 public class LightProcessRuntimeServiceProvider extends AbstractProcessRuntimeServiceProvider {
@@ -31,7 +32,7 @@ public LightProcessRuntimeServiceProvider() {
                 new DefaultWorkItemHandlerConfig(),
                 new DefaultProcessEventListenerConfig(),
                 new DefaultSignalManagerHub(),
-                DefaultUnitOfWorkManager.get(),
+                new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory()),
                 new NoOpIdentityProvider());
     }
 }
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java
index 3630476f015..3eaec2fce36 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java
@@ -73,6 +73,7 @@
 import org.kie.kogito.jobs.ProcessJobDescription;
 import org.kie.kogito.services.identity.NoOpIdentityProvider;
 import org.kie.kogito.services.jobs.impl.LegacyInMemoryJobService;
+import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
 import org.kie.kogito.signal.SignalManager;
 import org.kie.kogito.uow.UnitOfWorkManager;
@@ -97,7 +98,7 @@ public ProcessRuntimeImpl(Application application, InternalWorkingMemory working
         this.kruntime = workingMemory.getKnowledgeRuntime();
         initProcessInstanceManager();
         initSignalManager();
-        unitOfWorkManager = DefaultUnitOfWorkManager.get();
+        unitOfWorkManager = new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory());
         jobService = new LegacyInMemoryJobService(kogitoProcessRuntime, unitOfWorkManager);
         this.processEventSupport = new KogitoProcessEventSupportImpl(new NoOpIdentityProvider());
         if (isActive()) {