Prettified code and reverted unnecessary changes

Author: tomas-sexenian

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

@@ -25,13 +25,21 @@ private static BufferedImage createBufferedImageFromURI(String filePathOrUrl) th
 	{
 		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
+		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;