From 79bcc8f168174bc1aa57d592d60ad5fb8de797e6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 14:26:04 +0000
Subject: [PATCH] Use try-with-resources
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java | 63 ++++++-------------------------
1 files changed, 12 insertions(+), 51 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
index c0fc9f6..bd737d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
@@ -61,11 +61,6 @@
@Override
public boolean execute()
{
- FileInputStream fis = null;
- ZipOutputStream zip = null;
- boolean inputStreamOpen = false;
- boolean outputStreamOpen = false;
-
try
{
if(!originalFile.exists())
@@ -74,27 +69,20 @@
return false;
}
- fis = new FileInputStream(originalFile);
- inputStreamOpen = true;
- FileOutputStream fos = new FileOutputStream(newFile);
- zip = new ZipOutputStream(fos);
- outputStreamOpen = true;
-
- ZipEntry zipEntry = new ZipEntry(originalFile.getName());
- zip.putNextEntry(zipEntry);
-
- byte[] buf = new byte[8192];
- int n;
-
- while((n = fis.read(buf)) != -1)
+ try (FileInputStream fis = new FileInputStream(originalFile);
+ FileOutputStream fos = new FileOutputStream(newFile);
+ ZipOutputStream zip = new ZipOutputStream(fos))
{
- zip.write(buf, 0, n);
- }
+ ZipEntry zipEntry = new ZipEntry(originalFile.getName());
+ zip.putNextEntry(zipEntry);
- zip.close();
- outputStreamOpen = false;
- fis.close();
- inputStreamOpen = false;
+ byte[] buf = new byte[8192];
+ int n;
+ while ((n = fis.read(buf)) != -1)
+ {
+ zip.write(buf, 0, n);
+ }
+ }
if(deleteOriginal && !originalFile.delete())
{
@@ -106,34 +94,7 @@
} catch(IOException ioe)
{
logger.traceException(ioe);
- if (inputStreamOpen)
- {
- try
- {
- fis.close();
- }
- catch (Exception fe)
- {
- logger.traceException(fe);
- // Cannot do much. Ignore.
- }
- }
- if (outputStreamOpen)
- {
- try
- {
- zip.close();
- }
- catch (Exception ze)
- {
- logger.traceException(ze);
- // Cannot do much. Ignore.
- }
- }
return false;
}
}
-
-
}
-
--
Gitblit v1.10.0