Fix "Poor Error Handling Return Inside Finally" cases reported by For…

gxweb/src/main/java/com/genexus/usercontrols/UserControlGenerator.java

@@ -31,28 +31,14 @@ public String render(String internalName, GXMap propbag)
 		if (getTemplateDateTime() > lastRenderTime)
 		{
 			MustacheFactory mf = new DefaultMustacheFactory();
-			Reader reader = null;
-			try
+			try (Reader reader = new InputStreamReader(new FileInputStream(getTemplateFile(this.controlType)), "utf-8");)
 			{
-				reader = new InputStreamReader(new FileInputStream(getTemplateFile(this.controlType)), "utf-8");
 				mustache = mf.compile(reader, getTemplateFile(this.controlType));
 			}
 			catch (Exception e)
 			{
 				mustache = mf.compile(getTemplateFile(this.controlType));
 			}
-			finally
-			{
-				try
-				{
-					reader.close();
-				}
-				catch (IOException e)
-				{
-					logger.error("Failed to render UserControl ", e);
-					return "";
-				}
-			}
 			lastRenderTime = new Date().getTime();
 		}
 

java/src/main/java/com/genexus/specific/java/HttpClient.java

@@ -60,10 +60,7 @@ public com.genexus.internet.IHttpClient initHttpClientImpl() {
 
 			client = useHttpClientOldImplementation();
 
-		} finally {
-
-			return client;
-
 		}
+		return client;
 	}
 }