ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/50] [abbrv] incubator-ignite git commit: # ignite-6
Date Thu, 05 Feb 2015 11:50:45 GMT
# ignite-6


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

Branch: refs/heads/sprint-1
Commit: 3bcf4703cec716b489efa0af8e80aa7f826857cc
Parents: 81625f5
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 4 15:11:29 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 4 15:11:29 2015 +0300

----------------------------------------------------------------------
 .../CacheDataStructuresManager.java             | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bcf4703/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index dd9c5db..b88ca54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -433,11 +433,15 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K,
                         nodes,
                         true).get();
                 }
-                catch (ClusterTopologyException | ClusterTopologyCheckedException e) {
-                    if (log.isDebugEnabled())
-                        log.debug("BlockSet job failed, will retry: " + e);
+                catch (IgniteCheckedException e) {
+                    if (e.hasCause(ClusterTopologyException.class)) {
+                        if (log.isDebugEnabled())
+                            log.debug("RemoveSetData job failed, will retry: " + e);
 
-                    continue;
+                        continue;
+                    }
+                    else
+                        throw e;
                 }
 
                 try {
@@ -446,11 +450,15 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K,
                         nodes,
                         true).get();
                 }
-                catch (ClusterTopologyException | ClusterTopologyCheckedException e) {
-                    if (log.isDebugEnabled())
-                        log.debug("RemoveSetData job failed, will retry: " + e);
+                catch (IgniteCheckedException e) {
+                    if (e.hasCause(ClusterTopologyException.class)) {
+                        if (log.isDebugEnabled())
+                            log.debug("RemoveSetData job failed, will retry: " + e);
 
-                    continue;
+                        continue;
+                    }
+                    else
+                        throw e;
                 }
 
                 if (cctx.topologyVersionFuture().get() == topVer)


Mime
View raw message