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 D24D717AE6 for ; Fri, 19 Jun 2015 10:35:20 +0000 (UTC) Received: (qmail 20063 invoked by uid 500); 19 Jun 2015 10:35:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 20028 invoked by uid 500); 19 Jun 2015 10:35:20 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 20019 invoked by uid 99); 19 Jun 2015 10:35:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 10:35:20 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 19 Jun 2015 10:33:05 +0000 Received: (qmail 16665 invoked by uid 99); 19 Jun 2015 10:34:48 -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; Fri, 19 Jun 2015 10:34:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6482AE35D4; Fri, 19 Jun 2015 10:34:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 10:35:35 -0000 Message-Id: In-Reply-To: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> References: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] incubator-ignite git commit: ignite-950: enabling new marhsaller globally X-Virus-Checked: Checked by ClamAV on apache.org ignite-950: enabling new marhsaller globally Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b78653db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b78653db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b78653db Branch: refs/heads/ignite-950 Commit: b78653db508b7f66b46f9da8efaf39dcaf654ee0 Parents: 6e41372 Author: Denis Magda Authored: Fri Jun 19 13:29:50 2015 +0300 Committer: Denis Magda Committed: Fri Jun 19 13:29:50 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../apache/ignite/testframework/junits/IgniteTestResources.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b78653db/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 5cbe377..422f517 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 @@ -32,6 +32,7 @@ import org.apache.ignite.logger.java.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.jdk.*; import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.marshaller.optimized.ext.*; import org.apache.ignite.mxbean.*; import org.apache.ignite.plugin.segmentation.*; import org.apache.ignite.resources.*; @@ -1725,7 +1726,7 @@ public class IgnitionEx { marsh = new JdkMarshaller(); } else - marsh = new OptimizedMarshaller(); + marsh = new OptimizedMarshallerExt(); } myCfg.setMarshaller(marsh); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b78653db/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 68ae64b..e7609d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.resource.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.marshaller.optimized.ext.*; import org.apache.ignite.resources.*; import org.apache.ignite.testframework.config.*; import org.apache.ignite.testframework.junits.logger.*; @@ -232,7 +233,8 @@ public class IgniteTestResources { Marshaller marsh; if (marshallerName == null) - marsh = new OptimizedMarshaller(); + //marsh = new OptimizedMarshaller(); + marsh = new OptimizedMarshallerExt(); else { try { Class cls = (Class)Class.forName(marshallerName);