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 <dma...@gridgain.com> Authored: Fri Jun 19 13:29:50 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> 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<? extends Marshaller> cls = (Class<? extends Marshaller>)Class.forName(marshallerName);
