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:27:14 UTC

ignite git commit: Fix opcodes

Repository: ignite
Updated Branches:
  refs/heads/ignite-3199-1 dd023a5e2 -> 6f2ce42df


Fix opcodes


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

Branch: refs/heads/ignite-3199-1
Commit: 6f2ce42df2d760389900aedcf8c4857bdb7a8ce4
Parents: dd023a5
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Sep 9 13:26:51 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Sep 9 13:26:51 2016 +0300

----------------------------------------------------------------------
 .../processors/platform/cache/PlatformCacheInvoker.java         | 4 ++--
 .../Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6f2ce42d/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheInvoker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheInvoker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheInvoker.java
index 6962359..4aa3199 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheInvoker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheInvoker.java
@@ -71,8 +71,8 @@ public class PlatformCacheInvoker {
                 if (reader.readBoolean()) {
                     PlatformDotnetSessionData data = reader.readObject();
 
-                    proc = new PlatformDotnetSessionSetAndUnlockProcessor(data.lockNodeId(), data.lockId(), data.items(), data.isDiff(),
-                        data.staticObjects(), data.timeout());
+                    proc = new PlatformDotnetSessionSetAndUnlockProcessor(data.lockNodeId(), data.lockId(),
+                        data.items(), data.isDiff(), data.staticObjects(), data.timeout());
                 }
                 else {
                     UUID lockNodeId = reader.readUuid();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6f2ce42d/modules/platforms/dotnet/Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs
index 33eae6b..fe013c2 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/IgniteSessionStateStoreProvider.cs
@@ -53,8 +53,7 @@ namespace Apache.Ignite.AspNet
         private enum Op   // TODO: Move this to core to maintain a single list of codes.
         {
             Lock = 1,
-            Unlock = 2,
-            SetAndUnlock = 3,
+            SetAndUnlock = 2
         }
 
         /** Application id config parameter. */
@@ -459,7 +458,7 @@ namespace Apache.Ignite.AspNet
         /// </summary>
         private void UnlockItem(string key, long lockId)
         {
-            ((ICacheInternal) Cache).Invoke<object>((int) Op.Unlock, w =>
+            ((ICacheInternal) Cache).Invoke<object>((int) Op.SetAndUnlock, w =>
             {
                 w.WriteString(key);
                 w.WriteBoolean(false);  // Only unlock.