Refactor hostname logic (#2718)

* Refactor hostname logic * Fix checksytle issues
apache · Feb 13, 2018 · 68643ed · 68643ed
1 parent a2f0008
commit 68643ed
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/heron/tools/apiserver/src/java/com/twitter/heron/apiserver/resources/FileResource.java b/heron/tools/apiserver/src/java/com/twitter/heron/apiserver/resources/FileResource.java
@@ -157,8 +157,12 @@ private String getHostNameOrIP() {
     // Override hostname if provided in flags
     if (StringUtil.isNotBlank(getDownloadHostName())) {
       return getDownloadHostName();
+    } else if (StringUtil.isNotBlank(hostname)) {
+      return hostname;
+    } else if (ip != null && StringUtil.isNotBlank(ip.toString())) {
+      return ip.toString();
     }
-    return (hostname != null) ? hostname : ((ip != null) ? ip.toString() : "");
+    return "";
   }
 
 }