You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 12:15:20 UTC
incubator-ignite git commit: #ignite-1109: Fix comments after review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1109 51cf92dcf -> 70db4a1af
#ignite-1109: Fix comments after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/70db4a1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/70db4a1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/70db4a1a
Branch: refs/heads/ignite-1109
Commit: 70db4a1afbc36cdbc696dd910589e82f8544fd27
Parents: 51cf92d
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 13:15:13 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 13:15:13 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70db4a1a/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 dc071f3..7297f07 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
@@ -2640,19 +2640,14 @@ public class GridCacheProcessor extends GridProcessorAdapter {
(locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) ||
(rmtHashIdResolver == null && locHashIdResolver.equals(defHashIdResolver)))) {
- try {
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
- "Partitioned cache affinity hash ID resolver class",
- locHashIdResolver, rmtHashIdResolver, true);
- }
- catch (IgniteCheckedException e) {
- if (locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) {
- U.warn(log, "Set " + RendezvousAffinityFunction.class + " with " + defHashIdResolver +
- " to CacheConfiguration to start node [cacheName=" + rmtAttr.cacheName() + "]");
- }
+ CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
+ "Partitioned cache affinity hash ID resolver class",
+ locHashIdResolver, rmtHashIdResolver, true);
+ }
- throw e;
- }
+ if (locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) {
+ U.warn(log, "Set " + RendezvousAffinityFunction.class + " with " + defHashIdResolver +
+ " to CacheConfiguration to start node [cacheName=" + rmtAttr.cacheName() + "]");
}
}
}