X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPublishServlet.java;fp=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPublishServlet.java;h=949019d140b942fcc0655e0e526cb7c15c8d55e8;hb=d70c2ca145d2b3eac7ed6a4f16d41e322962cf59;hp=35205aa97683ff5d231e9aed8c25b81445883639;hpb=9602193f94e88e8d82936ba36fc20203227a4eec;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
index 35205aa9..949019d1 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
@@ -45,6 +45,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.Poker;
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
 import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;
 
 /**
  * This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the
@@ -158,9 +159,15 @@ public class PublishServlet extends BaseServlet {
                 } else {
                     // Generate new URL
                     String nextnode = getRedirectNode(feedid, req);
-                    nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
-                        "org.onap.dmaap.datarouter.provserver.https.port", "8443");
-                    String newurl = "https://" + nextnode + "/publish" + req.getPathInfo();
+                    if (Boolean.parseBoolean(ProvRunner.getProvProperties()
+                        .getProperty("org.onap.dmaap.datarouter.provserver.tlsenabled", "true"))) {
+                        nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
+                            "org.onap.dmaap.datarouter.nodeserver.https.port", "8443");
+                    } else {
+                        nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
+                            "org.onap.dmaap.datarouter.nodeserver.http.port", "8080");
+                    }
+                    String newurl = URLUtilities.getUrlSecurityOption() + nextnode + "/publish" + req.getPathInfo();
                     String qs = req.getQueryString();
                     if (qs != null) {
                         newurl += "?" + qs;