Merge "Fix Vulnerabilities in BaseServlet"

diff --combined datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
index 4576bd2,b73c463..15cc689
--- 1/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
--- 2/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
@@@ -45,7 -45,7 +45,7 @@@ public class URLUtilities 
       * @return the URL\r
       */\r
      public static String generateFeedURL(int feedid) {\r
-         return "https://" + BaseServlet.provName + "/feed/" + feedid;\r
+         return "https://" + BaseServlet.getProvName() + "/feed/" + feedid;\r
      }\r
  \r
      /**\r
@@@ -55,7 -55,7 +55,7 @@@
       * @return the URL\r
       */\r
      public static String generatePublishURL(int feedid) {\r
-         return "https://" + BaseServlet.provName + "/publish/" + feedid;\r
+         return "https://" + BaseServlet.getProvName() + "/publish/" + feedid;\r
      }\r
  \r
      /**\r
@@@ -65,7 -65,7 +65,7 @@@
       * @return the URL\r
       */\r
      public static String generateSubscribeURL(int feedid) {\r
-         return "https://" + BaseServlet.provName + "/subscribe/" + feedid;\r
+         return "https://" + BaseServlet.getProvName() + "/subscribe/" + feedid;\r
      }\r
  \r
      /**\r
@@@ -75,7 -75,7 +75,7 @@@
       * @return the URL\r
       */\r
      public static String generateFeedLogURL(int feedid) {\r
-         return "https://" + BaseServlet.provName + "/feedlog/" + feedid;\r
+         return "https://" + BaseServlet.getProvName() + "/feedlog/" + feedid;\r
      }\r
  \r
      /**\r
@@@ -85,7 -85,7 +85,7 @@@
       * @return the URL\r
       */\r
      public static String generateSubscriptionURL(int subid) {\r
-         return "https://" + BaseServlet.provName + "/subs/" + subid;\r
+         return "https://" + BaseServlet.getProvName() + "/subs/" + subid;\r
      }\r
  \r
      /**\r
@@@ -95,7 -95,7 +95,7 @@@
       * @return the URL\r
       */\r
      public static String generateSubLogURL(int subid) {\r
-         return "https://" + BaseServlet.provName + "/sublog/" + subid;\r
+         return "https://" + BaseServlet.getProvName() + "/sublog/" + subid;\r
      }\r
  \r
      /**\r
@@@ -115,7 -115,7 +115,7 @@@
      public static String generatePeerLogsURL() {\r
          //Fixes for Itrack ticket - DATARTR-4#Fixing if only one Prov is configured, not to give exception to fill logs.\r
          String peerPodUrl = getPeerPodName();\r
 -        if (peerPodUrl.equals("") || peerPodUrl.equals(null)) {\r
 +        if (peerPodUrl.equals("") || peerPodUrl==null) {\r
              return "";\r
          }\r
  \r