IGNITE-9200 fix failed local cache tests for entry processor

Signed-off-by: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
gridgain · Aug 13, 2018 · 713c221 · 713c221
1 parent 08a8ec3
commit 713c221
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1496,7 +1496,7 @@ else if (ttl == CU.TTL_NOT_CHANGED)
 
                 CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry<>(key, old, version(), keepBinary, this);
 
-                IgniteThread.onEntryProcessorEntered(true);
+                IgniteThread.onEntryProcessorEntered(false);
 
                 try {
                     Object computed = entryProcessor.process(entry, invokeArgs);

diff --git a/...n/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/...n/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -1109,7 +1109,7 @@ private Map<K, EntryProcessorResult> updateWithBatch(
 
                         boolean validation = false;
 
-                        IgniteThread.onEntryProcessorEntered(true);
+                        IgniteThread.onEntryProcessorEntered(false);
 
                         try {
                             Object computed = entryProcessor.process(invokeEntry, invokeArgs);

diff --git a/.../test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/.../test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -323,10 +323,12 @@ public void testInvokeAllAppliedOnceOnBinaryTypeRegistration() throws Exception
         for (Map.Entry<MyKey, Integer> entry : all.entrySet()) {
             if (entry.getKey().key.startsWith("remove"))
                 assertNull(entry.getValue());
-            else
-                assertEquals('"' + entry.getKey().key + "' entry has wrong value", 1, (int)entry.getValue());
-        }
+            else {
+                int value = entry.getValue();
 
+                assertEquals('"' + entry.getKey().key + "' entry has wrong value, exp=1 actl=" + value, 1, value);
+            }
+        }
     }
 
     /**