[asterixdb] 07/08: Merge branch 'gerrit/stabilization-f69489'

[mblow]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit c6b294123f0986f63917032172d208b43d500be2
Merge: 3e50a41 d0710ce
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sat Jan 11 12:42:54 2020 -0500

    Merge branch 'gerrit/stabilization-f69489'
    
    Change-Id: Ic49fc22902c43b4043b207351ee0dd9e4a9232d7

 .../main/java/org/apache/hyracks/api/comm/NetworkAddress.java | 11 ++++++++++-
 .../org/apache/hyracks/control/cc/work/RegisterNodeWork.java  |  2 +-
 .../hyracks/control/common/controllers/NodeRegistration.java  |  5 +++--
 .../org/apache/hyracks/control/nc/NodeControllerService.java  |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --cc 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
index aa1a01f,5f55513..9929ac4
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java
@@@ -110,15 -108,10 +111,15 @@@ public final class NodeRegistration imp
          this.inputArguments = runtimeMXBean.getInputArguments();
          this.systemProperties = runtimeMXBean.getSystemProperties();
          this.pid = PidHelper.getPid();
 +        IApplicationConfig cfg = 
ncConfig.getConfigManager().getNodeEffectiveConfig(nodeId);
 +        this.config = new HashMap<>();
 +        for (IOption option : cfg.getOptions()) {
 +            config.put(option.toSerializable(), cfg.get(option));
 +        }
      }
  
-     public InetSocketAddress getNodeControllerAddress() {
-         return ncAddress;
+     public NetworkAddress getNodeControllerPort() {
+         return ncPort;
      }
  
      public String getNodeId() {