ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [40/51] [abbrv] incubator-ignite git commit: IGNITE-264 - Regenerated message
Date Wed, 25 Feb 2015 00:52:18 GMT
IGNITE-264 - Regenerated message


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

Branch: refs/heads/ignite-264
Commit: 0a6557a21017de79b73660c62250d9c338db4064
Parents: ba7cbc0
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Feb 23 11:16:31 2015 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Feb 23 11:16:31 2015 -0800

----------------------------------------------------------------------
 .../distributed/dht/GridDhtLockRequest.java     | 29 ++++----------------
 1 file changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a6557a2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index eacefee..9de2816 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -57,9 +57,6 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
     /** Mini future ID. */
     private IgniteUuid miniId;
 
-    /** Owner mapped version bytes. */
-    private byte[] ownedBytes;
-
     /** Topology version. */
     private long topVer;
 
@@ -335,30 +332,24 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
                 writer.incrementState();
 
             case 22:
-                if (!writer.writeByteArray("ownedBytes", ownedBytes))
-                    return false;
-
-                writer.incrementState();
-
-            case 23:
                 if (!writer.writeBitSet("preloadKeys", preloadKeys))
                     return false;
 
                 writer.incrementState();
 
-            case 24:
+            case 23:
                 if (!writer.writeUuid("subjId", subjId))
                     return false;
 
                 writer.incrementState();
 
-            case 25:
+            case 24:
                 if (!writer.writeInt("taskNameHash", taskNameHash))
                     return false;
 
                 writer.incrementState();
 
-            case 26:
+            case 25:
                 if (!writer.writeLong("topVer", topVer))
                     return false;
 
@@ -410,14 +401,6 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
                 readState++;
 
             case 22:
-                ownedBytes = reader.readByteArray("ownedBytes");
-
-                if (!reader.isLastRead())
-                    return false;
-
-                readState++;
-
-            case 23:
                 preloadKeys = reader.readBitSet("preloadKeys");
 
                 if (!reader.isLastRead())
@@ -425,7 +408,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
 
                 readState++;
 
-            case 24:
+            case 23:
                 subjId = reader.readUuid("subjId");
 
                 if (!reader.isLastRead())
@@ -433,7 +416,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
 
                 readState++;
 
-            case 25:
+            case 24:
                 taskNameHash = reader.readInt("taskNameHash");
 
                 if (!reader.isLastRead())
@@ -441,7 +424,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K,
V> {
 
                 readState++;
 
-            case 26:
+            case 25:
                 topVer = reader.readLong("topVer");
 
                 if (!reader.isLastRead())


Mime
View raw message