[asterixdb] 02/02: Merge commit '79b243' from 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 4ad2efb1beaf45c2b441297e47c09cc50e6bba89
Merge: 84f7348 79b2433
Author: Murtadha Hubail <mhub...@apache.org>
AuthorDate: Fri May 31 04:00:19 2019 +0300

    Merge commit '79b243' from stabilization-f69489
    
    Change-Id: Ie2387663ab0cd4544eb9ec6f12ec2ba74136ef83

 .../hyracks/control/cc/ClusterControllerService.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --cc 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
index de1b18d,91397a8..1e92f16
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
@@@ -218,12 -210,10 +218,11 @@@ public class ClusterControllerService i
          IIPCI ciIPCI = new ClientInterfaceIPCI(this, jobIdFactory);
          clientIPC =
                  new IPCSystem(new 
InetSocketAddress(ccConfig.getClientListenAddress(), 
ccConfig.getClientListenPort()),
 -                        ciIPCI, new 
JavaSerializationBasedPayloadSerializerDeserializer());
 +                        networkSecurityManager.getSocketChannelFactory(), 
ciIPCI,
 +                        new 
JavaSerializationBasedPayloadSerializerDeserializer());
-         webServer = new WebServer(this, ccConfig.getConsoleListenPort());
          clusterIPC.start();
          clientIPC.start();
-         webServer.start();
+         startWebServers();
          info = new ClusterControllerInfo(ccId, 
ccConfig.getClientPublicAddress(), ccConfig.getClientPublicPort(),
                  ccConfig.getConsolePublicPort());
          timer.schedule(sweeper, 0, ccConfig.getDeadNodeSweepThreshold());