You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2016/09/09 10:56:20 UTC

ignite git commit: cleanup

Repository: ignite
Updated Branches:
  refs/heads/ignite-3199-1 55df081b2 -> 8fa16adb4


cleanup


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fa16adb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fa16adb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fa16adb

Branch: refs/heads/ignite-3199-1
Commit: 8fa16adb48480da18ed20d3ccfb434cf0df80a0a
Parents: 55df081
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Sep 9 13:56:11 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Sep 9 13:56:11 2016 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCache.java         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa16adb/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 3a0b51a..9bf1d47 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -196,7 +196,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     public static final int OP_LOAD_ALL = 40;
 
     /** */
-    public static final int OP_INVOKE_INTERNAL = 41;
+    public static final int OP_EXTENSION = 41;
 
     /** Underlying JCache in binary mode. */
     private final IgniteCacheProxy cache;
@@ -457,14 +457,17 @@ public class PlatformCache extends PlatformAbstractTarget {
                     });
                 }
 
-                case OP_INVOKE_INTERNAL:
-                    return writeResult(mem, PlatformCacheInvoker.invoke(reader, cacheRaw));
-
                 case OP_LOCK:
                     return registerLock(cache.lock(reader.readObjectDetached()));
 
                 case OP_LOCK_ALL:
                     return registerLock(cache.lockAll(PlatformUtils.readCollection(reader)));
+
+                case OP_EXTENSION:
+                    // TODO: Refactor this
+                    // Either inject this logic somehow (use negative op ids or something)
+                    // Or inherit the class (needs a new JNI call)
+                    return writeResult(mem, PlatformCacheInvoker.invoke(reader, cacheRaw));
             }
         }
         catch (Exception e) {