fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6994a435 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6994a435 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6994a435 Branch: refs/heads/ignite-2788 Commit: 6994a435705abf41d99870b0786b6f6d184fedfe Parents: 1e72589 Author: Yakov Zhdanov <[email protected]> Authored: Wed Apr 27 13:02:50 2016 +0300 Committer: shtykh_roman <[email protected]> Committed: Fri May 13 16:11:15 2016 +0900 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 72 ++++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6994a435/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 450f628..d7dd8c8 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 @@ -3224,28 +3224,35 @@ class ServerImpl extends TcpDiscoveryImpl { boolean locLateAssignBool = locLateAssign != null ? locLateAssign : false; if (locMarshUseDfltSuidBool != rmtMarshUseDfltSuidBool) { - utilityPool.submit(new Runnable() { - @Override public void run() { - String errMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID + - " property value differs from remote node's value " + - "(to make sure all nodes in topology have identical marshaller settings, " + - "configure system property explicitly) " + - "[locMarshUseDfltSuid=" + locMarshUseDfltSuid + ", rmtMarshUseDfltSuid=" + rmtMarshUseDfltSuid + - ", locNodeAddrs=" + U.addressesAsString(locNode) + - ", rmtNodeAddrs=" + U.addressesAsString(node) + - ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']'; - - String sndMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID + - " property value differs from remote node's value " + - "(to make sure all nodes in topology have identical marshaller settings, " + - "configure system property explicitly) " + - "[locMarshUseDfltSuid=" + rmtMarshUseDfltSuid + - ", rmtMarshUseDfltSuid=" + locMarshUseDfltSuid + - ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() + - ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() + - ", rmtNodeId=" + locNode.id() + ']'; + utilityPool.submit( + new Runnable() { + @Override public void run() { + String errMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID + + " property value differs from remote node's value " + + "(to make sure all nodes in topology have identical marshaller settings, " + + "configure system property explicitly) " + + "[locMarshUseDfltSuid=" + locMarshUseDfltSuid + + ", rmtMarshUseDfltSuid=" + rmtMarshUseDfltSuid + + ", locNodeAddrs=" + U.addressesAsString(locNode) + + ", rmtNodeAddrs=" + U.addressesAsString(node) + + ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']'; - nodeCheckError(node, errMsg, sndMsg); + String sndMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID + + " property value differs from remote node's value " + + "(to make sure all nodes in topology have identical marshaller settings, " + + "configure system property explicitly) " + + "[locMarshUseDfltSuid=" + rmtMarshUseDfltSuid + + ", rmtMarshUseDfltSuid=" + locMarshUseDfltSuid + + ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() + + ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() + + ", rmtNodeId=" + locNode.id() + ']'; + + nodeCheckError( + node, + errMsg, + sndMsg); + } + }); // Ignore join request. return; @@ -3270,15 +3277,20 @@ class ServerImpl extends TcpDiscoveryImpl { ", rmtNodeAddrs=" + U.addressesAsString(node) + ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']'; - String sndMsg = "Local node's binary marshaller \"compactFooter\" property differs from " + - "the same property on remote node (make sure all nodes in topology have the same value " + - "of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool + - ", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool + - ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() + - ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() + - ", rmtNodeId=" + locNode.id() + ']'; - - nodeCheckError(node, errMsg, sndMsg); + String sndMsg = "Local node's binary marshaller \"compactFooter\" property differs from " + + "the same property on remote node (make sure all nodes in topology have the same value " + + "of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool + + ", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool + + ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() + + ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() + + ", rmtNodeId=" + locNode.id() + ']'; + + nodeCheckError( + node, + errMsg, + sndMsg); + } + }); // Ignore join request. return;
