sprint-2 - Fixed logger and query processor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b4cb17ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b4cb17ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b4cb17ca Branch: refs/heads/ignite-185 Commit: b4cb17cabfe18af03a38356daba58e0e108a7fed Parents: 62de5af Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 19 14:58:06 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 19 14:58:06 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../ignite/internal/processors/query/GridQueryProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4cb17ca/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 2f365fb..6503ed9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1854,7 +1854,7 @@ public class IgnitionEx { Class<?> log4jCls; try { - log4jCls = Class.forName("org.apache.ignite.logger.log4j.IgniteLog4jLogger"); + log4jCls = Class.forName("org.apache.ignite.logger.log4j.Log4JLogger"); } catch (ClassNotFoundException | NoClassDefFoundError ignored) { log4jCls = null; @@ -1909,7 +1909,7 @@ public class IgnitionEx { ((LoggerNodeIdAware)cfgLog).setNodeId(nodeId); if (log4jInitErr != null) - U.warn(cfgLog, "Failed to initialize IgniteLog4jLogger (falling back to standard java logging): " + U.warn(cfgLog, "Failed to initialize Log4JLogger (falling back to standard java logging): " + log4jInitErr.getCause()); return cfgLog; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4cb17ca/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 1a68619..f503161 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -650,7 +650,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { for (CacheConfiguration<?, ?> ccfg : ctx.config().getCacheConfiguration()){ CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); - if (qryCfg != null) { + if (qryCfg != null && ccfg.getTypeMetadata() != null) { for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) portableIds.put(ctx.portable().typeId(meta.getValueType()), meta.getValueType()); } @@ -676,7 +676,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { for (CacheConfiguration<?, ?> ccfg : ctx.config().getCacheConfiguration()){ CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); - if (qryCfg != null) { + if (qryCfg != null && ccfg.getTypeMetadata() != null) { for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) declaredTypesById.put(new TypeId(ccfg.getName(), ctx.portable().typeId(meta.getValueType())), meta); }
