You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2019/12/10 10:05:09 UTC
[ignite] branch master updated: IGNITE-12419 Fixed JCache TCK
CacheLoader checks - Fixes #7103.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cec6dc4 IGNITE-12419 Fixed JCache TCK CacheLoader checks - Fixes #7103.
cec6dc4 is described below
commit cec6dc4a37a72058dd40c4d74b9ef1e8c7b0d7c3
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Tue Dec 10 13:00:07 2019 +0300
IGNITE-12419 Fixed JCache TCK CacheLoader checks - Fixes #7103.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
.../ignite/internal/processors/cache/GridCacheProcessor.java | 9 +++++----
.../security/cache/EntryProcessorPermissionCheckTest.java | 2 +-
parent/pom.xml | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
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 2f1e5bc..5cf1122 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
@@ -5016,6 +5016,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
else {
CacheConfiguration cfg = new CacheConfiguration(ccfg);
+ CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg);
+
+ // Cache configuration must be initialized before splitting.
+ initialize(cfg, cacheObjCtx);
+
req.deploymentId(IgniteUuid.randomUuid());
T2<CacheConfiguration, CacheConfigurationEnrichment> splitCfg = backwardCompatibleSplitter().split(cfg);
@@ -5025,10 +5030,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cfg = splitCfg.get1();
- CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg);
-
- initialize(req.startCacheConfiguration(), cacheObjCtx);
-
if (restartId != null)
req.schema(new QuerySchema(qryEntities == null ? cfg.getQueryEntities() : qryEntities));
else
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/EntryProcessorPermissionCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/EntryProcessorPermissionCheckTest.java
index 7534a57..24bd1ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/EntryProcessorPermissionCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cache/EntryProcessorPermissionCheckTest.java
@@ -79,7 +79,7 @@ public class EntryProcessorPermissionCheckTest extends AbstractCacheOperationPer
c.accept(CACHE_NAME, entry);
- assertThat(verifierNode.cache(CACHE_NAME).get(entry.getKey()), is(entry.getValue()));
+ assertThat(verifierNode.<String, Integer>cache(CACHE_NAME).get(entry.getKey()), is(entry.getValue()));
}
/** */
diff --git a/parent/pom.xml b/parent/pom.xml
index 85116e2..9cf545b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<jaxb.impl.version>2.1.14</jaxb.impl.version>
<javassist.version>3.20.0-GA</javassist.version>
<javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
- <javax.cache.tck.version>1.0.1</javax.cache.tck.version>
+ <javax.cache.tck.version>1.1.0</javax.cache.tck.version>
<javax.cache.version>1.0.0</javax.cache.version>
<jboss.rmi.version>1.0.6.Final</jboss.rmi.version>
<jetbrains.annotations.version>16.0.3</jetbrains.annotations.version>