IGNITE-22080 Fix ConflictResolver fails on debug logging (#261)

apache · Apr 19, 2024 · d369228 · d369228
2 parents af7fdb0 + 88236ca
commit d369228
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...src/main/java/org/apache/ignite/cdc/conflictresolve/CacheVersionConflictResolverImpl.java b/...src/main/java/org/apache/ignite/cdc/conflictresolve/CacheVersionConflictResolverImpl.java
@@ -57,7 +57,7 @@ public class CacheVersionConflictResolverImpl implements CacheVersionConflictRes
      * @see CacheVersionConflictResolverImpl
      */
     @GridToStringInclude
-    private final String conflictResolveField;
+    protected final String conflictResolveField;
 
     /** Logger. */
     protected final IgniteLogger log;

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,18 @@ 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) {
+            log.debug("Can't resolve field value [field=" + conflictResolveField + ", val=" + val + ']');
+
+            return val;
+        }
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(CacheVersionConflictResolverImpl.class, this);