2.1 Fixed assert (cacheName can be null here).

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

Branch: refs/heads/ignite-2.1
Commit: 13399d530f3458c3bf59634857cb05f801e8cc34
Parents: d232648
Author: sboikov <sboi...@gridgain.com>
Authored: Fri Jul 7 15:24:09 2017 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Fri Jul 7 15:24:09 2017 +0300

----------------------------------------------------------------------
 .../processors/datastructures/DataStructuresProcessor.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/13399d53/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 4399fe2..5564b79 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -326,12 +326,10 @@ public final class DataStructuresProcessor extends 
GridProcessorAdapter implemen
      * @return {@code True} if cache with such name is used to store data 
structures.
      */
     public static boolean isDataStructureCache(String cacheName) {
-        assert cacheName != null;
-
-        return cacheName.startsWith(ATOMICS_CACHE_NAME) ||
+        return cacheName != null && (cacheName.startsWith(ATOMICS_CACHE_NAME) 
||
             cacheName.startsWith(DS_CACHE_NAME_PREFIX) ||
             cacheName.equals(DEFAULT_DS_GROUP_NAME) ||
-            cacheName.equals(DEFAULT_VOLATILE_DS_GROUP_NAME);
+            cacheName.equals(DEFAULT_VOLATILE_DS_GROUP_NAME));
     }
 
     /**

Reply via email to