motiejus
/
jgit
1
Fork 0
Code Releases Activity

AmazonS3Client: Open Input/OutputStream in try-with-resource 

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

23
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
View File

@ -89,8 +89,7 @@ protected void run() throws Exception {
if ("get".equals(op)) { //$NON-NLS-1$
final URLConnection c = s3.get(bucket, key);
int len = c.getContentLength();
final InputStream in = c.getInputStream();
try {
try (InputStream in = c.getInputStream()) {
outw.flush();
final byte[] tmp = new byte[2048];
while (len > 0) {
@ -103,8 +102,6 @@ protected void run() throws Exception {
len -= n;
}
outs.flush();
} finally {
in.close();
}
} else if ("ls".equals(op) || "list".equals(op)) { //$NON-NLS-1$//$NON-NLS-2$
@ -115,13 +112,12 @@ protected void run() throws Exception {
s3.delete(bucket, key);
} else if ("put".equals(op)) { //$NON-NLS-1$
final OutputStream os = s3.beginPut(bucket, key, null, null);
final byte[] tmp = new byte[2048];
int n;
while ((n = ins.read(tmp)) > 0)
os.write(tmp, 0, n);
os.close();
try (OutputStream os = s3.beginPut(bucket, key, null, null)) {
final byte[] tmp = new byte[2048];
int n;
while ((n = ins.read(tmp)) > 0)
os.write(tmp, 0, n);
}
} else {
throw die(MessageFormat.format(CLIText.get().unsupportedOperation, op));
}
@ -129,13 +125,10 @@ protected void run() throws Exception {
private Properties properties() {
try {
final InputStream in = new FileInputStream(propertyFile);
try {
try (InputStream in = new FileInputStream(propertyFile)) {
final Properties p = new Properties();
p.load(in);
return p;
} finally {
in.close();
}
} catch (FileNotFoundException e) {
throw die(MessageFormat.format(CLIText.get().noSuchFile, propertyFile), e);