Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1109 2189f30b6 -> ecbdf898e


#ignite-1109: code style


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

Branch: refs/heads/ignite-1109
Commit: ecbdf898eecccadacec9fed5e0d90352c1194026
Parents: 2189f30
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Thu Jul 9 14:41:12 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Thu Jul 9 14:41:12 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ecbdf898/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 5254197..52ca63e 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
@@ -2418,9 +2418,9 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
                 String rmtHashIdResolver = 
rmtAttr.affinityHashIdResolverClassName();
                 String defHashIdResolver = 
AffinityNodeAddressHashResolver.class.getName();
 
-                if (!((locHashIdResolver == null &&  rmtHashIdResolver == 
null) ||
-                    (locHashIdResolver == null &&  
rmtHashIdResolver.equals(defHashIdResolver)) ||
-                    (rmtHashIdResolver == null &&  
locHashIdResolver.equals(defHashIdResolver)))) {
+                if (!((locHashIdResolver == null && rmtHashIdResolver == null) 
||
+                    (locHashIdResolver == null && 
rmtHashIdResolver.equals(defHashIdResolver)) ||
+                    (rmtHashIdResolver == null && 
locHashIdResolver.equals(defHashIdResolver)))) {
                     CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, 
"cacheAffinity.hashIdResolver",
                         "Partitioned cache affinity hash ID resolver class",
                         locAttr.affinityHashIdResolverClassName(), 
rmtAttr.affinityHashIdResolverClassName(),

Reply via email to