IGNITE-22080 Fix ConflictResolver fails on debug logging

apache · Apr 19, 2024 · 107b38b · 107b38b
1 parent e8ebaf2
commit 107b38b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...ain/java/org/apache/ignite/cdc/conflictresolve/DebugCacheVersionConflictResolverImpl.java b/...ain/java/org/apache/ignite/cdc/conflictresolve/DebugCacheVersionConflictResolverImpl.java
@@ -45,10 +45,10 @@ public DebugCacheVersionConflictResolverImpl(byte clusterId, String conflictReso
         Object newVal = conflictResolveFieldEnabled ? newEntry.value(ctx) : null;
 
         if (oldVal != null)
-            oldVal = value(oldVal);
+            oldVal = debugValue(oldVal);
 
         if (newVal != null)
-            newVal = value(newVal);
+            newVal = debugValue(newVal);
 
         log.debug("isUseNew[" +
             "start=" + oldEntry.isStartVersion() +
@@ -63,6 +63,16 @@ public DebugCacheVersionConflictResolverImpl(byte clusterId, String conflictReso
         return res;
     }
 
+    /** @return Conflict resolve field value, or specified {@code val} if the field not found. */
+    private Object debugValue(Object val) {
+        try {
+            return super.value(val);
+        }
+        catch (Exception e) {
+            return val;
+        }
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(CacheVersionConflictResolverImpl.class, this);