Bug 571831 - Improve modernized help UI prototype of Eclipse 4.20I20210323-2250I20210323-1800I20210323-1240

Fix extra warnings as pointed in the I-build logs.

Change-Id: If7e5d938e28e4c92e895f6a18387ff7b28bcda81
Signed-off-by: Holger Voormann <eclipse@voormann.de>

1 files changed, 9 insertions, 4 deletions

diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpUiJs.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpUiJs.java
index f07ea4cbd..add043b22 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpUiJs.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpUiJs.java
@@ -10,6 +10,7 @@
 package org.eclipse.help.internal.webapp;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.URL;
 import java.util.Scanner;
 
@@ -27,10 +28,13 @@ public class HelpUiJs extends HttpServlet {
     private static final String JS_TEMPLATE_DEFAULT = "org.eclipse.help.webapp/m/index.js"; //$NON-NLS-1$
     private static final String JS_TEMPLATE = loadJsTemplate();
 
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         request.setCharacterEncoding("UTF-8"); //$NON-NLS-1$
         response.setContentType("text/html; charset=UTF-8"); //$NON-NLS-1$
-        response.getWriter().write(HelpUi.resolve(JS_TEMPLATE, request));
+        try (PrintWriter writer = response.getWriter()) {
+			writer.write(HelpUi.resolve(JS_TEMPLATE, request));
+		}
     }
 
     private static String loadJsTemplate() {
@@ -57,8 +61,9 @@ public class HelpUiJs extends HttpServlet {
 
         // read it as InputStream and convert it to a String
         // (by using a Scanner with a delimiter that cannot be found: \A - start of input)
-        Scanner scanAll = new Scanner(resourceAsUrl.openStream()).useDelimiter("\\A"); //$NON-NLS-1$
-        return scanAll.hasNext() ? scanAll.next() : ""; //$NON-NLS-1$
+        try (Scanner scanAll = new Scanner(resourceAsUrl.openStream()).useDelimiter("\\A")) { //$NON-NLS-1$
+        	return scanAll.hasNext() ? scanAll.next() : ""; //$NON-NLS-1$
+        }
     }
 
 }