You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/02/09 12:11:22 UTC
ignite git commit: IGNITE-1523
Repository: ignite
Updated Branches:
refs/heads/ignite-1523 [created] fa3aae9e6
IGNITE-1523
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa3aae9e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa3aae9e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa3aae9e
Branch: refs/heads/ignite-1523
Commit: fa3aae9e649f77a599dc26490aa061badd059dc1
Parents: e2e216d
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Feb 9 14:10:04 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Feb 9 14:10:04 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa3aae9e/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 5acad6c..7a36e73 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
@@ -3425,8 +3425,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
try {
if (val.getCacheStoreFactory() != null) {
try {
- marshaller.unmarshal(marshaller.marshal(val.getCacheStoreFactory()),
- val.getCacheStoreFactory().getClass().getClassLoader());
+ ClassLoader ldr = ctx.config().getClassLoader();
+
+ if (ldr == null)
+ ldr = val.getCacheStoreFactory().getClass().getClassLoader();
+
+ marshaller.unmarshal(marshaller.marshal(val.getCacheStoreFactory()), ldr);
}
catch (IgniteCheckedException e) {
throw new IgniteCheckedException("Failed to validate cache configuration. " +