[ambari] branch trunk updated: AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. (mpapirkovskyy)

[mpapirkovskyy]

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

mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 7d388ad  AMBARI-23055. GPL repo is not hidden when default version is 
chosen in UI. (mpapirkovskyy)
7d388ad is described below

commit 7d388adad9bc4736a711c5e7fefeca525f78dcff
Author: Myroslav Papirkovskyi <mpapirkovs...@apache.org>
AuthorDate: Tue Mar 6 17:28:43 2018 +0200

    AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. 
(mpapirkovskyy)
---
 .../ambari/server/controller/AmbariManagementControllerImpl.java       | 3 +--
 .../main/java/org/apache/ambari/server/controller/AmbariServer.java    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 1c921f2..90d6151 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -219,7 +219,6 @@ import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.scheduler.RequestExecutionFactory;
 import org.apache.ambari.server.state.stack.OsFamily;
-import org.apache.ambari.server.state.stack.RepoTag;
 import org.apache.ambari.server.state.stack.RepositoryXml;
 import org.apache.ambari.server.state.stack.WidgetLayout;
 import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
@@ -4389,7 +4388,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
         for (RepositoryXml.Repo repo : os.getRepos()) {
           RepositoryResponse resp = new RepositoryResponse(repo.getBaseUrl(), 
os.getFamily(),
               repo.getRepoId(), repo.getRepoName(), repo.getDistribution(), 
repo.getComponents(), repo.getMirrorsList(),
-              repo.getBaseUrl(), Collections.<RepoTag>emptySet());
+              repo.getBaseUrl(), repo.getTags());
 
           resp.setVersionDefinitionId(versionDefinitionId);
           resp.setStackName(stackId.getStackName());
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 7f0127f..1651f1a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -691,6 +691,7 @@ public class AmbariServer {
       apiConnector = new ServerConnector(server, acceptors, -1,
         new SslConnectionFactory(contextFactoryApi, 
HttpVersion.HTTP_1_1.toString()),
         new HttpConnectionFactory(https_config));
+      apiConnector.setPort(configs.getClientSSLApiPort());
     } else  {
       apiConnector = new ServerConnector(server, acceptors, -1, new 
HttpConnectionFactory(http_config));
       apiConnector.setPort(configs.getClientApiPort());

-- 
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.