ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [49/50] [abbrv] ignite git commit: Merge branch ignite-1.3.3-p6 into master.
Date Mon, 31 Aug 2015 02:01:32 GMT
Merge branch ignite-1.3.3-p6 into master.


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

Branch: refs/heads/ignite-843
Commit: 9f7dc5001a961a20e2bf24b3d6037585208ab2c1
Parents: 37a0505 612a6b8
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Aug 28 17:08:13 2015 -0700
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Aug 28 17:08:13 2015 -0700

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheIoManager.java | 10 +++++++++-
 .../processors/cache/GridCacheSharedContext.java      | 14 ++++++++------
 .../cache/transactions/IgniteTxAdapter.java           |  1 +
 3 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9f7dc500/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/9f7dc500/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index cc661d3,262d17a..10d2796
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@@ -329,14 -242,16 +329,16 @@@ public class GridCacheSharedContext<K, 
          if (preloadersStartFut == null) {
              GridCompoundFuture<Object, Object> compound = null;
  
 -            for (GridCacheContext cacheCtx : cacheContexts()) {
 +            for (GridCacheContext<?, ?> cacheCtx : cacheContexts()) {
-                 IgniteInternalFuture<Object> startFut = cacheCtx.preloader().startFuture();
+                 if (cacheCtx.startTopologyVersion() != null && cacheCtx.startTopologyVersion().compareTo(topVer)
<= 0) {
+                     IgniteInternalFuture<Object> startFut = cacheCtx.preloader().startFuture();
  
-                 if (!startFut.isDone()) {
-                     if (compound == null)
-                         compound = new GridCompoundFuture<>();
+                     if (!startFut.isDone()) {
+                         if (compound == null)
+                             compound = new GridCompoundFuture<>();
  
-                     compound.add(startFut);
+                         compound.add(startFut);
+                     }
                  }
              }
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/9f7dc500/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------


Mime
View raw message