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 2016/09/07 11:17:29 UTC
[44/50] [abbrv] ignite git commit: Finalization.
Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d1a2ed9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d1a2ed9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d1a2ed9
Branch: refs/heads/ignite-2649
Commit: 5d1a2ed90c0c76d0b55234a9819e5cf249430150
Parents: 4e6ec8e
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 14:00:55 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 14:00:55 2016 +0300
----------------------------------------------------------------------
.../processors/rest/protocols/tcp/MockNioSession.java | 3 +--
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 +--
.../java/org/apache/ignite/internal/binary/BinaryContext.java | 3 ++-
.../java/org/apache/ignite/marshaller/MarshallerUtils.java | 7 ++-----
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 +++-
5 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d1a2ed9/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
index 0129e93..c82c73e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/MockNioSession.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.rest.protocols.tcp;
+import java.net.InetSocketAddress;
import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
import org.apache.ignite.internal.util.nio.GridNioFinishedFuture;
import org.apache.ignite.internal.util.nio.GridNioFuture;
@@ -24,8 +25,6 @@ import org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor;
import org.apache.ignite.internal.util.nio.GridNioSession;
import org.jetbrains.annotations.Nullable;
-import java.net.InetSocketAddress;
-
/**
* Mock nio session with disabled functionality for testing parser.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d1a2ed9/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 fae513e..6791afc 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
@@ -76,7 +76,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.logger.LoggerNodeIdAware;
import org.apache.ignite.logger.java.JavaLogger;
-import org.apache.ignite.marshaller.AbstractNodeNameAwareMarshaller;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
@@ -1936,7 +1935,7 @@ public class IgnitionEx {
marsh = new BinaryMarshaller();
}
- MarshallerUtils.withNodeName(marsh, cfg.getGridName());
+ MarshallerUtils.setNodeName(marsh, cfg.getGridName());
myCfg.setMarshaller(marsh);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d1a2ed9/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 20f9a6d..cf1ac13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -129,6 +129,7 @@ public class BinaryContext {
/** Set of system classes that should be marshalled with BinaryMarshaller. */
private static final Set<String> BINARYLIZABLE_SYS_CLSS;
+ /** Binarylizable system classes set initialization. */
static {
Set<String> sysClss = new HashSet<>();
@@ -242,7 +243,7 @@ public class BinaryContext {
assert metaHnd != null;
assert igniteCfg != null;
- MarshallerUtils.withNodeName(optmMarsh, igniteCfg.getGridName());
+ MarshallerUtils.setNodeName(optmMarsh, igniteCfg.getGridName());
this.metaHnd = metaHnd;
this.igniteCfg = igniteCfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d1a2ed9/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
index 93226e8..9668baf 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java
@@ -29,13 +29,10 @@ public class MarshallerUtils {
*
* @param marsh Marshaller instance.
* @param nodeName Node name.
- * @return Marshaller instance.
*/
- public static Marshaller withNodeName(Marshaller marsh, @Nullable String nodeName) {
+ public static void setNodeName(Marshaller marsh, @Nullable String nodeName) {
if (marsh instanceof AbstractNodeNameAwareMarshaller)
((AbstractNodeNameAwareMarshaller)marsh).nodeName(nodeName);
-
- return marsh;
}
/**
@@ -47,7 +44,7 @@ public class MarshallerUtils {
public static JdkMarshaller jdkMarshaller(@Nullable String nodeName) {
JdkMarshaller marsh = new JdkMarshaller();
- withNodeName(new JdkMarshaller(), nodeName);
+ setNodeName(new JdkMarshaller(), nodeName);
return marsh;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d1a2ed9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d9560c6..1922340 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1991,7 +1991,9 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
* @return Marshaller.
*/
protected Marshaller marshaller() {
- return MarshallerUtils.withNodeName(marsh, gridName);
+ MarshallerUtils.setNodeName(marsh, gridName);
+
+ return marsh;
}
/** {@inheritDoc} */