From d75993324093515a7621eac0fda7249d2a97af5c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 01 Jun 2015 09:11:04 +0000
Subject: [PATCH] Used try-with-resources
---
opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java
index 4af5529..7db7c5f 100644
--- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java
+++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java
@@ -105,13 +105,15 @@
throw new IOException("Could not read input to copy.");
}
createFile(copy);
- OutputStream outputStream = new FileOutputStream(copy);
- int bytesRead;
- byte[] buffer = new byte[4096];
- while ((bytesRead = original.read(buffer)) > 0) {
- outputStream.write(buffer, 0, bytesRead);
+ try (OutputStream outputStream = new FileOutputStream(copy)) {
+ int bytesRead;
+ byte[] buffer = new byte[4096];
+ while ((bytesRead = original.read(buffer)) > 0) {
+ outputStream.write(buffer, 0, bytesRead);
+ }
+ } finally {
+ closeSilently(original);
}
- closeSilently(original, outputStream);
}
/**
@@ -231,16 +233,13 @@
configuration = getConfiguration();
// FreeMarker takes the data and a Writer to process the template.
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- Writer writer = new OutputStreamWriter(outputStream);
- try {
+ try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ Writer writer = new OutputStreamWriter(outputStream)) {
Template configurationTemplate = configuration.getTemplate(template);
configurationTemplate.process(map, writer);
return outputStream.toString();
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
- } finally {
- org.forgerock.util.Utils.closeSilently(writer, outputStream);
}
}
--
Gitblit v1.10.0