Repair Portal defects; upgrade Docker build.

[portal.git] / ecomp-portal-BE-common / src / main / java / org / openecomp / portalapp / portal / utils / EcompPortalUtils.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
index 2b39da0..d471d90 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
@@ -354,5 +354,20 @@ public class EcompPortalUtils {
                        return "https";
                }               
        }
+       
+       public static String localOrDockerHost(){
+               final String effectiveHost;
+               try{
+                       effectiveHost = SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_HOSTNAME);
+                       return (effectiveHost == null || effectiveHost.trim().equals("")) ? "localhost" : effectiveHost ;
+               }
+               catch(IllegalStateException ese){
+                       //looks like SystemProperties.getProperty throws IllegalStateException if it cannot find a property you are looking for
+                       //In order to not break the code if a non-required property is missing from system.properties, returning https as default
+                       //when this exception is caught.
+                       return "localhost";
+               }               
+       }
+
 
 }