ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
Date Mon, 13 Mar 2017 09:26:32 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4768 4edd7beae -> 3ce0496aa


Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java


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

Branch: refs/heads/ignite-4768
Commit: 3ce0496aa2a6ebc92a692335427a0d5558badffd
Parents: 4edd7be
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 13 12:26:19 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 13 12:26:19 2017 +0300

----------------------------------------------------------------------
 .../near/GridNearTxFinishResponse.java          | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3ce0496a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index efe96b8..310e90d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -66,8 +66,13 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
      * @param miniId Mini future Id.
      * @param err Error.
      */
-    public GridNearTxFinishResponse(int part, GridCacheVersion xid, long nearThreadId, IgniteUuid
futId, int miniId,
-        @Nullable Throwable err) {
+    public GridNearTxFinishResponse(int part,
+        GridCacheVersion xid,
+        long nearThreadId,
+        IgniteUuid futId,
+        int miniId,
+        @Nullable Throwable err)
+    {
         super(part, xid, futId);
 
         assert miniId != 0;
@@ -128,19 +133,19 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
         }
 
         switch (writer.state()) {
-            case 5:
+            case 7:
                 if (!writer.writeByteArray("errBytes", errBytes))
                     return false;
 
                 writer.incrementState();
 
-            case 6:
+            case 8:
                 if (!writer.writeInt("miniId", miniId))
                     return false;
 
                 writer.incrementState();
 
-            case 7:
+            case 9:
                 if (!writer.writeLong("nearThreadId", nearThreadId))
                     return false;
 
@@ -162,7 +167,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
             return false;
 
         switch (reader.state()) {
-            case 5:
+            case 7:
                 errBytes = reader.readByteArray("errBytes");
 
                 if (!reader.isLastRead())
@@ -170,7 +175,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
 
                 reader.incrementState();
 
-            case 6:
+            case 8:
                 miniId = reader.readInt("miniId");
 
                 if (!reader.isLastRead())
@@ -178,7 +183,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
 
                 reader.incrementState();
 
-            case 7:
+            case 9:
                 nearThreadId = reader.readLong("nearThreadId");
 
                 if (!reader.isLastRead())
@@ -198,7 +203,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse
{
 
     /** {@inheritDoc} */
     @Override public byte fieldsCount() {
-        return 8;
+        return 10;
     }
 
     /** {@inheritDoc} */


Mime
View raw message