Fix deployment cache issue for dmn engine

flowable · Apr 3, 2024 · 8a3cded · 8a3cded
1 parent 85183ef
commit 8a3cded
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/...ngine/src/main/java/org/flowable/dmn/engine/impl/deployer/CachingAndArtifactsManager.java b/...ngine/src/main/java/org/flowable/dmn/engine/impl/deployer/CachingAndArtifactsManager.java
@@ -51,6 +51,7 @@ public void updateCachingAndArtifacts(ParsedDeployment parsedDeployment) {
 
             // Add to deployment for further usage
             deployment.addDeployedArtifact(decisionEntity);
+            deployment.addDecisionCacheEntry(decisionEntity.getId(), cacheEntry);
         }
     }
 }
diff --git a/...gine/src/main/java/org/flowable/dmn/engine/impl/persistence/deploy/DeploymentManager.java b/...gine/src/main/java/org/flowable/dmn/engine/impl/persistence/deploy/DeploymentManager.java
@@ -147,7 +147,7 @@ public DecisionCacheEntry resolveDecision(DmnDecision decision) {
 
             deployment.setNew(false);
             deploy(deployment, null);
-            cachedDecision = decisionCache.get(decisionId);
+            cachedDecision = deployment.getDecisionCacheEntry(decisionId);
 
             if (cachedDecision == null) {
                 throw new FlowableException("deployment '" + deploymentId + "' didn't put decision '" + decisionId + "' in the cache");

diff --git a/...ne/src/main/java/org/flowable/dmn/engine/impl/persistence/entity/DmnDeploymentEntity.java b/...ne/src/main/java/org/flowable/dmn/engine/impl/persistence/entity/DmnDeploymentEntity.java
@@ -20,6 +20,7 @@
 import org.flowable.common.engine.api.repository.EngineResource;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
 import org.flowable.dmn.api.DmnDeployment;
+import org.flowable.dmn.engine.impl.persistence.deploy.DecisionCacheEntry;
 
 /**
  * @author Tijs Rademakers
@@ -32,6 +33,10 @@ public interface DmnDeploymentEntity extends DmnDeployment, Entity {
     void addDeployedArtifact(Object deployedArtifact);
 
     <T> List<T> getDeployedArtifacts(Class<T> clazz);
+
+    void addDecisionCacheEntry(String decisionDefinitionId, DecisionCacheEntry decisionCacheEntry);
+
+    DecisionCacheEntry getDecisionCacheEntry(String decisionDefinitionId);
 
     void setName(String name);
 

diff --git a/...rc/main/java/org/flowable/dmn/engine/impl/persistence/entity/DmnDeploymentEntityImpl.java b/...rc/main/java/org/flowable/dmn/engine/impl/persistence/entity/DmnDeploymentEntityImpl.java
@@ -22,6 +22,7 @@
 
 import org.flowable.common.engine.api.repository.EngineResource;
 import org.flowable.dmn.engine.DmnEngineConfiguration;
+import org.flowable.dmn.engine.impl.persistence.deploy.DecisionCacheEntry;
 
 /**
  * @author Tijs Rademakers
@@ -43,6 +44,7 @@ public class DmnDeploymentEntityImpl extends AbstractDmnEngineNoRevisionEntity i
      * Will only be used during actual deployment to pass deployed artifacts (eg decision tables). Will be null otherwise.
      */
     protected Map<Class<?>, List<Object>> deployedArtifacts;
+    protected Map<String, DecisionCacheEntry> decisionDefinitionCache = new HashMap<>();
 
     public DmnDeploymentEntityImpl() {
 
@@ -98,6 +100,16 @@ public <T> List<T> getDeployedArtifacts(Class<T> clazz) {
         }
         return null;
     }
+
+    @Override
+    public void addDecisionCacheEntry(String decisionDefinitionId, DecisionCacheEntry decisionCacheEntry) {
+        decisionDefinitionCache.put(decisionDefinitionId, decisionCacheEntry);
+    }
+
+    @Override
+    public DecisionCacheEntry getDecisionCacheEntry(String decisionDefinitionId) {
+        return decisionDefinitionCache.get(decisionDefinitionId);
+    }
 
     // getters and setters ////////////////////////////////////////////////////////