You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/02/06 08:15:47 UTC
[3/8] ignite git commit: ignite-db-x compile err fix
resetLostPartitions
ignite-db-x compile err fix resetLostPartitions
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a6736e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a6736e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a6736e6
Branch: refs/heads/ignite-3477-putdown
Commit: 8a6736e64dd42917cf385e45043e536e53841278
Parents: a70dc00
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Feb 3 13:53:13 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Feb 3 13:53:13 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +-
.../src/main/java/org/apache/ignite/IgniteSpringBean.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a6736e6/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 542a18c..987d696 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
@@ -2582,7 +2582,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
Collection<DynamicCacheChangeRequest> reqs = new ArrayList<>(cacheNames.size());
for (String cacheName : cacheNames) {
- DynamicCacheDescriptor desc = registeredCaches.get(cacheName);
+ DynamicCacheDescriptor desc = registeredCaches.get(maskNull(cacheName));
if (desc == null) {
log.warning("Reset lost partition will not be executed, " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a6736e6/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index c5c1ad1..fc45a25 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -265,6 +265,13 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
}
/** {@inheritDoc} */
+ @Override public void resetLostPartitions(Collection<String> cacheNames) {
+ checkIgnite();
+
+ g.resetLostPartitions(cacheNames);
+ }
+
+ /** {@inheritDoc} */
@Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) {
checkIgnite();