Refactor Prov DB handling

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / PublishServlet.java

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 2ca2453..35205aa 100644 (file)
--- 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
@@ -41,10 +41,10 @@ import org.json.JSONArray;
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.json.JSONTokener;\r
+import org.onap.dmaap.datarouter.provisioning.utils.Poker;\r
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
 import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
-import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
 \r
 /**\r
  * This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the\r
@@ -158,7 +158,8 @@ public class PublishServlet extends BaseServlet {
                 } else {\r
                     // Generate new URL\r
                     String nextnode = getRedirectNode(feedid, req);\r
-                    nextnode = nextnode + ":" + DB.getHttpsPort();\r
+                    nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(\r
+                        "org.onap.dmaap.datarouter.provserver.https.port", "8443");\r
                     String newurl = "https://" + nextnode + "/publish" + req.getPathInfo();\r
                     String qs = req.getQueryString();\r
                     if (qs != null) {\r