motiejus
/
jgit
1
Fork 0
Code Releases Activity

AmazonS3: Open InputStream/FileInputStream in try-with-resource 

Change-Id: I71606e14d2b3cf085b8d1343c3858e7a729a173e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-03-05 20:11:59 +09:00
parent c633ea2ac4
commit f6dbc7d472
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
View File

@ -650,11 +650,8 @@ void authorize(final HttpURLConnection c) throws IOException {
static Properties properties(final File authFile) static Properties properties(final File authFile)
throws FileNotFoundException, IOException { throws FileNotFoundException, IOException {
final Properties p = new Properties(); final Properties p = new Properties();
final FileInputStream in = new FileInputStream(authFile); try (FileInputStream in = new FileInputStream(authFile)) {
try {
p.load(in); p.load(in);
} finally {
in.close();
} }
return p; return p;
} }
@ -697,16 +694,13 @@ void list() throws IOException {
throw new IOException(JGitText.get().noXMLParserAvailable); throw new IOException(JGitText.get().noXMLParserAvailable);
} }
xr.setContentHandler(this); xr.setContentHandler(this);
final InputStream in = c.getInputStream(); try (InputStream in = c.getInputStream()) {
try {
xr.parse(new InputSource(in)); xr.parse(new InputSource(in));
} catch (SAXException parsingError) { } catch (SAXException parsingError) {
throw new IOException( throw new IOException(
MessageFormat.format( MessageFormat.format(
JGitText.get().errorListing, prefix), JGitText.get().errorListing, prefix),
parsingError); parsingError);
} finally {
in.close();
} }
return; return;