Author: swagle
Date: Wed Jun 19 21:28:38 2013
New Revision: 1494777
URL: http://svn.apache.org/r1494777
Log:
AMBARI-2438. If HTTPS is enabled, server does not pass correct port during
bootstrap. (Dmitry Lysnichenko via swagle)
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java?rev=1494777&r1=1494776&r2=1494777&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
Wed Jun 19 21:28:38 2013
@@ -64,7 +64,7 @@ public class BootStrapImpl {
InetAddress.getLocalHost().getCanonicalHostName());
this.clusterOsType = conf.getServerOsType();
this.projectVersion = ambariMetaInfo.getServerVersion();
- this.serverPort = conf.getClientApiPort();
+ this.serverPort = (conf.getApiSSLAuthentication())?
conf.getClientSSLApiPort() : conf.getClientApiPort();
}
/**
