Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-259: Bug Fix

This commit is contained in:
Mark Payne 2016-01-17 20:32:04 -05:00
parent eba25ecaca
commit 95a3115f9b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
View File

@ -33,7 +33,6 @@ import org.apache.commons.lang3.StringUtils;
* @Threadsafe * @Threadsafe
*/ */
public class NodeIdentifier { public class NodeIdentifier {
/** /**
* the unique identifier for the node * the unique identifier for the node
*/ */
@ -106,7 +105,7 @@ public class NodeIdentifier {
this.socketAddress = socketAddress; this.socketAddress = socketAddress;
this.socketPort = socketPort; this.socketPort = socketPort;
this.nodeDn = dn; this.nodeDn = dn;
this.siteToSiteAddress = siteToSiteAddress; this.siteToSiteAddress = siteToSiteAddress == null ? apiAddress : siteToSiteAddress;
this.siteToSitePort = siteToSitePort; this.siteToSitePort = siteToSitePort;
this.siteToSiteSecure = siteToSiteSecure; this.siteToSiteSecure = siteToSiteSecure;
} }
@ -214,7 +213,9 @@ public class NodeIdentifier {
@Override @Override
public String toString() { 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 + ']';
} }
} }