ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: Merge branch 'ignite-1.5' into ignite-426-2
Date Thu, 19 Nov 2015 10:04:21 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-426-2 8925ccef7 -> f531f5340


Merge branch 'ignite-1.5' into ignite-426-2


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

Branch: refs/heads/ignite-426-2
Commit: f531f5340557f7c6997496433c7af020b129a5bc
Parents: 8925cce
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Nov 19 13:04:18 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Nov 19 13:04:18 2015 +0300

----------------------------------------------------------------------
 .../internal/managers/communication/GridIoMessageFactory.java    | 4 ++--
 .../cache/distributed/GridDistributedTxRemoteAdapter.java        | 4 ++--
 .../cache/query/continuous/CacheContinuousQueryBatchAck.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f531f534/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index ff3efb7..0e5755c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -697,12 +697,12 @@ public class GridIoMessageFactory implements MessageFactory {
 
                 break;
 
-            case 115:
+            case 116:
                 msg = new CacheContinuousQueryBatchAck();
 
                 break;
 
-            // [-3..115] - this
+            // [-3..116] - this
             // [120..123] - DR
             // [-4..-22] - SQL
             default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/f531f534/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index e47aeef..f9ac2df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -267,10 +267,10 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
 
     /** {@inheritDoc} */
     @Override public void setPartitionUpdateCounters(long[] cntrs) {
-        if (writeMap != null && !writeMap.isEmpty() && cntrs != null &&
cntrs.length > 0) {
+        if (writeMap() != null && !writeMap().isEmpty() && cntrs != null
&& cntrs.length > 0) {
             int i = 0;
 
-            for (IgniteTxEntry txEntry : writeMap.values()) {
+            for (IgniteTxEntry txEntry : writeMap().values()) {
                 txEntry.updateCounter(cntrs[i]);
 
                 ++i;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f531f534/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
index 87e2ff5..e44cc2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
@@ -148,7 +148,7 @@ public class CacheContinuousQueryBatchAck extends GridCacheMessage {
 
     /** {@inheritDoc} */
     @Override public byte directType() {
-        return 115;
+        return 116;
     }
 
     /** {@inheritDoc} */


Mime
View raw message