ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [23/36] ignite git commit: IGNITE-426 Fixed tests.
Date Wed, 04 Nov 2015 14:11:06 GMT
IGNITE-426 Fixed tests.


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

Branch: refs/heads/ignite-462-2
Commit: 1a41612fbdca4d577dbf770d2bfbe03f2fdc1405
Parents: 980bd37
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Nov 3 15:04:04 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Wed Nov 4 17:02:48 2015 +0300

----------------------------------------------------------------------
 .../cache/query/continuous/CacheContinuousQueryHandler.java   | 7 +++++--
 .../processors/continuous/StartRoutineDiscoveryMessage.java   | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a41612f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 1df5963..3ddce94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -583,7 +583,8 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
{
         PartitionRecovery rec = rcvs.get(e.partition());
 
         if (rec == null) {
-            rec = new PartitionRecovery(ctx.log(getClass()), cacheContext(ctx), initUpdIdx.get(e.partition()));
+            rec = new PartitionRecovery(ctx.log(getClass()), cacheContext(ctx),
+                initUpdIdx == null ? null : initUpdIdx.get(e.partition()));
 
             PartitionRecovery oldRec = rcvs.putIfAbsent(e.partition(), rec);
 
@@ -645,8 +646,10 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
{
 
         /**
          * @param log Logger.
+         * @param cctx Cache context.
+         * @param initIdx Update counters.
          */
-        public PartitionRecovery(IgniteLogger log, GridCacheContext cctx, Long initIdx) {
+        public PartitionRecovery(IgniteLogger log, GridCacheContext cctx, @Nullable Long
initIdx) {
             this.log = log;
             this.cctx = cctx;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1a41612f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index cfacde4..ce818f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -38,7 +38,7 @@ public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage
{
     private final Map<UUID, IgniteCheckedException> errs = new HashMap<>();
 
     /** */
-    private final Map<Integer, Long> updateIdxes = new HashMap<>();
+    private Map<Integer, Long> updateIdxes;
 
     /**
      * @param routineId Routine id.
@@ -69,6 +69,9 @@ public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage
{
      * @param idx Update indexes.
      */
     public void addUpdateIdxs(Map<Integer, Long> idx) {
+        if (updateIdxes == null)
+            updateIdxes = new HashMap<>();
+
         for (Map.Entry<Integer, Long> e : idx.entrySet()) {
             Long cntr0 = updateIdxes.get(e.getKey());
             Long cntr1 = e.getValue();


Mime
View raw message