Prettified code and reverted unnecessary changes

Author: tomas-sexenian

common/src/main/java/com/genexus/IHttpContext.java

@@ -63,5 +63,5 @@ public interface IHttpContext {
 	boolean isHttpContextNull();
 	boolean isHttpContextWeb();
 
-
+	String getContextPath();
 }

java/src/main/java/com/genexus/GxImageUtil.java

@@ -23,27 +23,23 @@ private static InputStream getInputStream(String filePathOrUrl) throws IOExcepti
 
 	private static BufferedImage createBufferedImageFromURI(String filePathOrUrl) throws IOException
 	{
-		InputStream is;
-		try {
-			if (PrivateUtilities.isValidURL(filePathOrUrl))
-				is = new URL(filePathOrUrl).openStream();
-			else{
+		IHttpContext httpContext = com.genexus.ModelContext.getModelContext().getHttpContext();
+		InputStream is = null;
+		try{
+			if (filePathOrUrl.toLowerCase().startsWith("http://") || filePathOrUrl.toLowerCase().startsWith("https://") ||
+				(httpContext.isHttpContextWeb() && filePathOrUrl.startsWith(httpContext.getContextPath())))
+				is = new URL(GXDbFile.pathToUrl( filePathOrUrl, httpContext)).openStream();
+			else
 				is = getGXFile(filePathOrUrl).getStream();
-			}
 			return ImageIO.read(is);
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			log.error("Failed to read image stream: " + filePathOrUrl);
 			throw e;
-		}
+		} finally { is.close(); }
 	}
 
 	private static GXFile getGXFile(String filePathOrUrl) {
 		String basePath = (com.genexus.ModelContext.getModelContext() != null) ? com.genexus.ModelContext.getModelContext().getHttpContext().getDefaultPath(): "";
-		String environmentName = basePath.substring(basePath.lastIndexOf("\\") + 1);
-		if (filePathOrUrl.substring(1).startsWith(environmentName)) {
-			filePathOrUrl = filePathOrUrl.substring(environmentName.length() + 2);
-		}
 		return new GXFile(basePath, filePathOrUrl, ResourceAccessControlList.Default, GxFileInfoSourceType.Unknown);
 	}
 

java/src/main/java/com/genexus/PrivateUtilities.java

@@ -18,10 +18,8 @@
 import java.io.PushbackInputStream;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.InvalidPathException;
-import java.io.FileNotFoundException;
 import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.Random;
@@ -627,29 +625,6 @@ public static boolean isAbsoluteFilePath(String path) {
 		}
 	}
 
-
-	/**
-	 * <pre>
-	 * Checks if a string has valid URL syntax and points to a valid resource on the web.
-	 * Null safe.
-	 * </pre>
-	 */
-	//Me fijo si la sintaxis del string es la sintaxis de una URL y si
-	//de verdad existe a lo que esta apuntando
-	public static boolean isValidURL(String urlString) {
-		try {
-			URL url = new URL(urlString);
-			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-			connection.setRequestMethod("HEAD");
-			int responseCode = connection.getResponseCode();
-			return (responseCode == HttpURLConnection.HTTP_OK);
-		} catch (MalformedURLException | FileNotFoundException  e) {
-			return false;
-		} catch (IOException | NullPointerException e) {
-			return false;
-		}
-	}
-
 	public static String addLastPathSeparator(String dir)
 	{
 		return addLastChar(dir, File.separator);