You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/02 16:26:24 UTC
[1/2] ignite git commit: IGNITE-1359: Created logic for platform
processor instantiation.
Repository: ignite
Updated Branches:
refs/heads/master 9fe121cc4 -> 414f26eaa
IGNITE-1359: Created logic for platform processor instantiation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff6c2c83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff6c2c83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff6c2c83
Branch: refs/heads/master
Commit: ff6c2c83f387ade46c712fa253771bcfbb8cd3b2
Parents: 9910b6f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 2 17:26:44 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 2 17:26:44 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/IgniteKernal.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff6c2c83/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index d9fef86..5ce646e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3101,13 +3101,19 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (cls.equals(DiscoveryNodeValidationProcessor.class))
return (T)new OsDiscoveryNodeValidationProcessor(ctx);
- if (cls.equals(PlatformProcessor.class))
- return (T)new PlatformNoopProcessor(ctx);
-
Class<T> implCls = null;
try {
- implCls = (Class<T>)Class.forName(componentClassName(cls));
+ String clsName;
+
+ // Handle special case for PlatformProcessor
+ if (cls.equals(PlatformProcessor.class))
+ clsName = ctx.config().getPlatformConfiguration() == null ?
+ PlatformNoopProcessor.class.getName() : cls.getName() + "Impl";
+ else
+ clsName = componentClassName(cls);
+
+ implCls = (Class<T>)Class.forName(clsName);
}
catch (ClassNotFoundException ignore) {
// No-op.
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/414f26ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/414f26ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/414f26ea
Branch: refs/heads/master
Commit: 414f26eaa2a232c72174b9768c0be8d5442f5f09
Parents: ff6c2c8 9fe121c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 2 17:27:08 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 2 17:27:08 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/platform/cache/PlatformCache.java | 2 +-
parent/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------