X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FURLUtilities.java;h=ffed1a1b55e5222416a219a63df6556079bf569d;hb=29c4f8051e4fc856cd84b97e31f445f65f7e497d;hp=b58ab5a02f8030fc5846e4962190e75dddd11154;hpb=1a00b59927f6b0c17ccb7c40221ec9bce231c964;p=dmaap%2Fdatarouter.git

diff --git a/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
index b58ab5a0..ffed1a1b 100644
--- a/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
@@ -24,6 +24,8 @@
 
 package org.onap.dmaap.datarouter.provisioning.utils;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -37,7 +39,7 @@ import org.onap.dmaap.datarouter.provisioning.BaseServlet;
  * @version $Id: URLUtilities.java,v 1.2 2014/03/12 19:45:41 eby Exp $
  */
 public class URLUtilities {
-
+    private static final EELFLogger utilsLogger = EELFManager.getInstance().getLogger("UtilsLog");
     /**
      * Generate the URL used to access a feed.
      *
@@ -45,7 +47,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generateFeedURL(int feedid) {
-        return "https://" + BaseServlet.provName + "/feed/" + feedid;
+        return "https://" + BaseServlet.getProvName() + "/feed/" + feedid;
     }
 
     /**
@@ -55,7 +57,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generatePublishURL(int feedid) {
-        return "https://" + BaseServlet.provName + "/publish/" + feedid;
+        return "https://" + BaseServlet.getProvName() + "/publish/" + feedid;
     }
 
     /**
@@ -65,7 +67,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generateSubscribeURL(int feedid) {
-        return "https://" + BaseServlet.provName + "/subscribe/" + feedid;
+        return "https://" + BaseServlet.getProvName() + "/subscribe/" + feedid;
     }
 
     /**
@@ -75,7 +77,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generateFeedLogURL(int feedid) {
-        return "https://" + BaseServlet.provName + "/feedlog/" + feedid;
+        return "https://" + BaseServlet.getProvName() + "/feedlog/" + feedid;
     }
 
     /**
@@ -85,7 +87,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generateSubscriptionURL(int subid) {
-        return "https://" + BaseServlet.provName + "/subs/" + subid;
+        return "https://" + BaseServlet.getProvName() + "/subs/" + subid;
     }
 
     /**
@@ -95,7 +97,7 @@ public class URLUtilities {
      * @return the URL
      */
     public static String generateSubLogURL(int subid) {
-        return "https://" + BaseServlet.provName + "/sublog/" + subid;
+        return "https://" + BaseServlet.getProvName() + "/sublog/" + subid;
     }
 
     /**
@@ -115,7 +117,7 @@ public class URLUtilities {
     public static String generatePeerLogsURL() {
         //Fixes for Itrack ticket - DATARTR-4#Fixing if only one Prov is configured, not to give exception to fill logs.
         String peerPodUrl = getPeerPodName();
-        if (peerPodUrl.equals("") || peerPodUrl.equals(null)) {
+        if (peerPodUrl == null || peerPodUrl.equals("")) {
             return "";
         }
 
@@ -134,6 +136,7 @@ public class URLUtilities {
                 this_pod = InetAddress.getLocalHost().getHostName();
                 System.out.println("this_pod: " + this_pod);
             } catch (UnknownHostException e) {
+                utilsLogger.trace("UnkownHostException: " + e.getMessage(), e);
                 this_pod = "";
             }
             System.out.println("ALL PODS: " + Arrays.asList(BaseServlet.getPods()));