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 2016/03/02 09:11:38 UTC
[19/19] ignite git commit: ignite-1232 Merge from master.
ignite-1232 Merge from master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fe6db71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fe6db71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fe6db71
Branch: refs/heads/ignite-1232
Commit: 4fe6db71fd537b599c7b9c1cf168887cd8bdef90
Parents: 3a51439
Author: sboikov <sb...@gridgain.com>
Authored: Wed Mar 2 11:08:11 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Mar 2 11:08:11 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4fe6db71/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 382ba2d..5cbd02b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1817,11 +1817,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
U.error(log, "Failed to drop schema on cache stop (will ignore): " + U.maskName(ccfg.getName()), e);
}
- for (Iterator<Map.Entry<T3<String, String, Boolean>, TwoStepCachedQuery>> it = twoStepCache.entrySet().iterator();
+ for (Iterator<Map.Entry<TwoStepCachedQueryKey, TwoStepCachedQuery>> it = twoStepCache.entrySet().iterator();
it.hasNext();) {
- Map.Entry<T3<String, String, Boolean>, TwoStepCachedQuery> e = it.next();
+ Map.Entry<TwoStepCachedQueryKey, TwoStepCachedQuery> e = it.next();
- if (F.eq(e.getKey().get1(), ccfg.getName()))
+ if (F.eq(e.getKey().space, ccfg.getName()))
it.remove();
}
}