commit e7322b460c5984e149b1072a44cf07780a73e901
author Nikita Timofeev <stariy95@gmail.com> Wed Nov 13 18:01:27 2019 +0300
committer Nikita Timofeev <stariy95@gmail.com> Wed Nov 13 18:01:27 2019 +0300
tree 3a5e7b9a933869f61205ee17142fc803a6c5f465
parent 22b4f01fedf595782bbc03916dbdf92cc09fc92c

Resolve values eagerly in EffectiveOpId

cayenne-server/src/main/java/org/apache/cayenne/access/flush/EffectiveOpId.java

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/EffectiveOpId.java b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/EffectiveOpId.java
index 8a94793..f61b35e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/EffectiveOpId.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/EffectiveOpId.java
@@ -19,7 +19,9 @@
 
 package org.apache.cayenne.access.flush;
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import org.apache.cayenne.ObjectId;
 
@@ -38,7 +40,12 @@
     public EffectiveOpId(ObjectId id) {
         this.id = id;
         this.entityName = id.getEntityName();
-        this.snapshot = id.getIdSnapshot();
+        this.snapshot = new HashMap<>(id.getIdSnapshot());
+        this.snapshot.entrySet().forEach(entry -> {
+            if(entry.getValue() instanceof Supplier) {
+                entry.setValue(((Supplier) entry.getValue()).get());
+            }
+        });
     }
 
     @Override