Add the attribute only if binary marshaller is used.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df859c0a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df859c0a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df859c0a Branch: refs/heads/ignite-sql-opt Commit: df859c0a1b3c493d7df56a3e76699cac6169a06a Parents: 802d48b Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Sat Nov 21 15:17:06 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Sat Nov 21 15:17:06 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df859c0a/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 249564a..082ffa5 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 @@ -158,6 +158,7 @@ import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.lifecycle.LifecycleEventType; import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean; import org.apache.ignite.mxbean.IgniteMXBean; import org.apache.ignite.mxbean.ThreadPoolMXBean; @@ -1276,9 +1277,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { add(ATTR_MARSHALLER_USE_DFLT_SUID, getBoolean(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, OptimizedMarshaller.USE_DFLT_SUID)); - add(ATTR_MARSHALLER_COMPACT_FOOTER, cfg.getBinaryConfiguration() == null ? - BinaryConfiguration.DFLT_COMPACT_FOOTER : - cfg.getBinaryConfiguration().isCompactFooter()); + if (cfg.getMarshaller() instanceof BinaryMarshaller) { + add(ATTR_MARSHALLER_COMPACT_FOOTER, cfg.getBinaryConfiguration() == null ? + BinaryConfiguration.DFLT_COMPACT_FOOTER : + cfg.getBinaryConfiguration().isCompactFooter()); + } add(ATTR_USER_NAME, System.getProperty("user.name")); add(ATTR_GRID_NAME, gridName);