diff options
| author | Alexander Kurtakov | 2016-10-31 11:51:01 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2016-10-31 11:51:01 +0000 |
| commit | cdc9dc237aef775123e84584e5616acebc83a7ad (patch) | |
| tree | 72d97ee9bb53f2f915699c36f5c70b10d07fd55c | |
| parent | 100a27d63dd96f2e233bc9316bd848fe63c0c52d (diff) | |
| download | eclipse.platform.ua-cdc9dc237aef775123e84584e5616acebc83a7ad.tar.gz eclipse.platform.ua-cdc9dc237aef775123e84584e5616acebc83a7ad.tar.xz eclipse.platform.ua-cdc9dc237aef775123e84584e5616acebc83a7ad.zip | |
Warning fixes.Y20161103-1000I20161101-0800
Few more try-with-resources.
Change-Id: Ifc92de32422ed7ea079a2f800bfa50a1e1fa1913
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java | 14 | ||||
| -rw-r--r-- | org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java index f7ae95a93..1100661d5 100644 --- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java +++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java @@ -154,10 +154,9 @@ public class HelpURLConnection extends URLConnection { } private InputStream getLocalHelp(Bundle plugin) { - InputStream in; // first try using content provider, then try to find the file // inside doc.zip, and finally try the file system - in = ResourceLocator.openFromProducer(plugin, + InputStream in = ResourceLocator.openFromProducer(plugin, query == null ? getFile() : getFile() + "?" + query, //$NON-NLS-1$ getLocale()); @@ -504,14 +503,13 @@ public class HelpURLConnection extends URLConnection { try{ if (in!=null) { - BufferedReader br = new BufferedReader(new InputStreamReader(in)); - String line,result=""; //$NON-NLS-1$ + String line, result = ""; //$NON-NLS-1$ + try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) { - while ((line = br.readLine())!=null) - { - result+=line+'\n'; + while ((line = br.readLine()) != null) { + result += line + '\n'; + } } - br.close(); in.close(); return result; } diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java index 2cc7c6417..ff30e5050 100644 --- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java +++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/PrintData.java @@ -391,11 +391,12 @@ public class PrintData extends RequestData { in = HelpSystem.getHelpContent(href, locale); } - Reader reader = new BufferedReader(new InputStreamReader(in, charset)); - char[] cbuf = new char[4096]; - int num; - while ((num = reader.read(cbuf)) > 0) { - buf.append(cbuf, 0, num); + try (Reader reader = new BufferedReader(new InputStreamReader(in, charset))) { + char[] cbuf = new char[4096]; + int num; + while ((num = reader.read(cbuf)) > 0) { + buf.append(cbuf, 0, num); + } } } catch (Exception e) { |