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:34 UTC
[49/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/e5722f68
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5722f68
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5722f68
Branch: refs/heads/ignite-2649
Commit: e5722f68cf6cf96ad9f843a0d367aa12ba7fb108
Parents: 798b767
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 14:13:29 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 14:13:29 2016 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ClientImpl.java | 10 ++++------
.../ignite/spi/discovery/tcp/ServerImpl.java | 21 ++++++++------------
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 1 -
.../spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++--
.../TcpDiscoveryMulticastIpFinder.java | 13 +-----------
.../TcpDiscoveryCustomEventMessage.java | 15 +++++++++-----
6 files changed, 25 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index a359a9c..e1ddbe6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -684,10 +684,8 @@ class ClientImpl extends TcpDiscoveryImpl {
// Use security-unsafe getter.
Map<String, Object> attrs = new HashMap<>(node.getAttributes());
- attrs.put(
- IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
- spi.marshaller().marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS))
- );
+ attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+ spi.marshaller().marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
node.setAttributes(attrs);
}
@@ -1213,8 +1211,8 @@ class ClientImpl extends TcpDiscoveryImpl {
List<TcpDiscoveryAbstractMessage> msgs = null;
while (!isInterrupted()) {
- TcpDiscoveryAbstractMessage msg =
- spi.marshaller().unmarshal(in, U.resolveClassLoader(spi.ignite().configuration()));
+ TcpDiscoveryAbstractMessage msg = spi.marshaller().unmarshal(in,
+ U.resolveClassLoader(spi.ignite().configuration()));
if (msg instanceof TcpDiscoveryClientReconnectMessage) {
TcpDiscoveryClientReconnectMessage res = (TcpDiscoveryClientReconnectMessage)msg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 35cd5d1..ace6ddc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -65,7 +65,6 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteNodeAttributes;
@@ -1240,10 +1239,8 @@ class ServerImpl extends TcpDiscoveryImpl {
// Use security-unsafe getter.
Map<String, Object> attrs = new HashMap<>(node.getAttributes());
- attrs.put(
- IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
- spi.marshaller().marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS))
- );
+ attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+ spi.marshaller().marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
node.setAttributes(attrs);
}
@@ -4853,9 +4850,8 @@ class ServerImpl extends TcpDiscoveryImpl {
if (nextMsg != null) {
try {
- TcpDiscoveryCustomEventMessage ackMsg =
- new TcpDiscoveryCustomEventMessage(getLocalNodeId(), nextMsg,
- spi.marshaller().marshal(nextMsg));
+ TcpDiscoveryCustomEventMessage ackMsg = new TcpDiscoveryCustomEventMessage(
+ getLocalNodeId(), nextMsg, spi.marshaller().marshal(nextMsg));
ackMsg.topologyVersion(msg.topologyVersion());
@@ -4986,9 +4982,8 @@ class ServerImpl extends TcpDiscoveryImpl {
if (node != null) {
try {
- final IgniteConfiguration cfg = spi.ignite().configuration();
-
- DiscoverySpiCustomMessage msgObj = msg.message(spi.marshaller(), U.resolveClassLoader(cfg));
+ DiscoverySpiCustomMessage msgObj = msg.message(spi.marshaller(),
+ U.resolveClassLoader(spi.ignite().configuration()));
lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT,
msg.topologyVersion(),
@@ -5434,8 +5429,8 @@ class ServerImpl extends TcpDiscoveryImpl {
while (!isInterrupted()) {
try {
- TcpDiscoveryAbstractMessage msg =
- spi.marshaller().unmarshal(in, U.resolveClassLoader(spi.ignite().configuration()));
+ TcpDiscoveryAbstractMessage msg = spi.marshaller().unmarshal(in,
+ U.resolveClassLoader(spi.ignite().configuration()));
msg.senderNodeId(nodeId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 341e536..30b83e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -26,7 +26,6 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedDeque;
-
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/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 1922340..5ba3e35 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
@@ -1462,8 +1462,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
try {
sock.setSoTimeout((int)timeout);
- T res = marshaller().unmarshal(in == null ?
- sock.getInputStream() : in, U.resolveClassLoader(ignite.configuration()));
+ T res = marshaller().unmarshal(in == null ? sock.getInputStream() : in,
+ U.resolveClassLoader(ignite.configuration()));
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 268ee52..8b29efd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -640,15 +640,6 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
}
}
- /**
- * get Ignite configuration if possible.
- *
- * @return Ignite config or {@code null}.
- */
- @Nullable private String getGridName() {
- return ignite == null ? null : ignite.name();
- }
-
/** {@inheritDoc} */
@Override public void close() {
if (addrSnds != null) {
@@ -701,12 +692,10 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
this.addrs = addrs;
byte[] addrsData = marsh.marshal(addrs);
-
data = new byte[U.IGNITE_HEADER.length + addrsData.length];
if (data.length > MAX_DATA_LENGTH)
- throw new IgniteCheckedException("Too long data packet [size=" + data.length +
- ", max=" + MAX_DATA_LENGTH + "]");
+ throw new IgniteCheckedException("Too long data packet [size=" + data.length + ", max=" + MAX_DATA_LENGTH + "]");
System.arraycopy(U.IGNITE_HEADER, 0, data, 0, U.IGNITE_HEADER.length);
System.arraycopy(addrsData, 0, data, 4, addrsData.length);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5722f68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index f627104..ca5dd56 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -18,7 +18,6 @@
package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
-
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.marshaller.Marshaller;
@@ -71,9 +70,15 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
}
/**
- * @param marsh Marshaller.
- * @param ldr Class loader.
- * @return Deserialized message.
+ * @return Deserialized message,
+ * @throws java.lang.Throwable if unmarshal failed.
+ */
+ @Nullable public DiscoverySpiCustomMessage message(@NotNull Marshaller marsh) throws Throwable {
+ return message(marsh, null);
+ }
+
+ /**
+ * @return Deserialized message,
* @throws java.lang.Throwable if unmarshal failed.
*/
@Nullable public DiscoverySpiCustomMessage message(@NotNull Marshaller marsh, ClassLoader ldr) throws Throwable {
@@ -99,4 +104,4 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
@Override public String toString() {
return S.toString(TcpDiscoveryCustomEventMessage.class, this, "super", super.toString());
}
-}
\ No newline at end of file
+}