ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-471-2: fixed NPE in cache processor
Date Tue, 19 May 2015 15:29:45 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-471-2 950e26fe5 -> 1f4ddddf6


ignite-471-2: fixed NPE in cache processor


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

Branch: refs/heads/ignite-471-2
Commit: 1f4ddddf6e30a102f36441bde166c7b0edec8728
Parents: 950e26f
Author: Denis Magda <dmagda@gridgain.com>
Authored: Tue May 19 18:25:32 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Tue May 19 18:25:32 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java      | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f4ddddf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c75de82..d4acbb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -780,6 +780,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         for (CacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
             GridCacheAdapter<?, ?> cache = caches.get(maskNull(cfg.getName()));
 
+            if (cache == null)
+                continue;
+
             if (cfg.getRebalanceMode() == SYNC) {
                 if (cfg.getCacheMode() == REPLICATED ||
                     (cfg.getCacheMode() == PARTITIONED && cfg.getRebalanceDelay()
>= 0))


Mime
View raw message