You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/02/06 04:36:14 UTC
[18/50] nifi git commit: NIFI-259: Bug Fix
NIFI-259: Bug Fix
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/95a3115f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/95a3115f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/95a3115f
Branch: refs/heads/master
Commit: 95a3115f9bf075b704bc393bddba235e4a946710
Parents: eba25ec
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun Jan 17 20:32:04 2016 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun Jan 17 20:32:04 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/cluster/protocol/NodeIdentifier.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/95a3115f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
index f48012a..cb4dd6a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang3.StringUtils;
* @Threadsafe
*/
public class NodeIdentifier {
-
/**
* the unique identifier for the node
*/
@@ -106,7 +105,7 @@ public class NodeIdentifier {
this.socketAddress = socketAddress;
this.socketPort = socketPort;
this.nodeDn = dn;
- this.siteToSiteAddress = siteToSiteAddress;
+ this.siteToSiteAddress = siteToSiteAddress == null ? apiAddress : siteToSiteAddress;
this.siteToSitePort = siteToSitePort;
this.siteToSiteSecure = siteToSiteSecure;
}
@@ -214,7 +213,9 @@ public class NodeIdentifier {
@Override
public String toString() {
- return "[" + "id=" + id + ", apiAddress=" + apiAddress + ", apiPort=" + apiPort + ", socketAddress=" + socketAddress + ", socketPort=" + socketPort + ']';
+ return "[" + "id=" + id + ", apiAddress=" + apiAddress + ", apiPort=" + apiPort
+ + ", socketAddress=" + socketAddress + ", socketPort=" + socketPort
+ + ", siteToSiteAddress=" + siteToSiteAddress + ", siteToSitePort=" + siteToSitePort + ']';
}
}