Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B54DF10462 for ; Tue, 8 Sep 2015 17:08:52 +0000 (UTC) Received: (qmail 63717 invoked by uid 500); 8 Sep 2015 17:08:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63646 invoked by uid 500); 8 Sep 2015 17:08:52 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 63565 invoked by uid 99); 8 Sep 2015 17:08:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2015 17:08:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D10C9E0777; Tue, 8 Sep 2015 17:08:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Tue, 08 Sep 2015 17:08:54 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/45] ignite git commit: Revert "ignite-gg-10720: fixing issue when IgniteNodeAttribute.MARSH is set to invalid value" Revert "ignite-gg-10720: fixing issue when IgniteNodeAttribute.MARSH is set to invalid value" This reverts commit 4c6b8ff5e971108c0e42e7e845c59fff10bde1d0. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55027dc7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55027dc7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55027dc7 Branch: refs/heads/ignite-264 Commit: 55027dc77781ced5d435fae5fe803b1528eaa10c Parents: 4c6b8ff Author: sboikov Authored: Mon Sep 7 10:08:50 2015 +0300 Committer: sboikov Committed: Mon Sep 7 10:08:50 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 7 +++---- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 +--------- .../java/org/apache/ignite/plugin/PluginProvider.java | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/55027dc7/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 4209119..14d7c14 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 @@ -657,7 +657,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param igfsExecSvc IGFS executor service. * @param restExecSvc Reset executor service. * @param errHnd Error handler to use for notification about startup problems. - * @param plugins Plugins. * @throws IgniteCheckedException Thrown in case of any errors. */ @SuppressWarnings({"CatchGenericClass", "unchecked"}) @@ -670,9 +669,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - GridAbsClosure errHnd, - List plugins - ) + GridAbsClosure errHnd) throws IgniteCheckedException { gw.compareAndSet(null, new GridKernalGatewayImpl(cfg.getGridName())); @@ -761,6 +758,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // Ack configuration. ackSpis(); + List plugins = U.allPluginProviders(); + // Spin out SPIs & managers. try { ctx = new GridKernalContextImpl(log, http://git-wip-us.apache.org/repos/asf/ignite/blob/55027dc7/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 b4c0dee..02b28c5 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 @@ -78,7 +78,6 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.mxbean.IgnitionMXBean; -import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.plugin.segmentation.SegmentationPolicy; import org.apache.ignite.resources.SpringApplicationContextResource; import org.apache.ignite.spi.IgniteSpi; @@ -1510,11 +1509,6 @@ public class IgnitionEx { IgniteConfiguration myCfg = initializeConfiguration(cfg); - List plugins = U.allPluginProviders(); - - for (PluginProvider provider : plugins) - provider.initConfiguration(myCfg); - // Set configuration URL, if any, into system property. if (startCtx.configUrl() != null) System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString()); @@ -1626,9 +1620,7 @@ public class IgnitionEx { @Override public void apply() { startLatch.countDown(); } - }, - plugins - ); + }); state = STARTED; http://git-wip-us.apache.org/repos/asf/ignite/blob/55027dc7/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java index da67a35..47acf0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java @@ -57,8 +57,6 @@ public interface PluginProvider { */ public T plugin(); - public void initConfiguration(IgniteConfiguration cfg); - /** * Registers extensions. *