From a1ddc35d07699c8d0635d47f9bb25e2b03965a71 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 29 May 2013 08:30:05 +0000
Subject: [PATCH] Minor cleanup in preparation for final release.
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java | 4 +++-
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
index 15ad979..0bf40cd 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
@@ -27,6 +27,7 @@
package org.forgerock.opendj.ldif;
+import static com.forgerock.opendj.util.StaticUtils.closeSilently;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.forgerock.opendj.ldap.CoreMessages.ERR_LDIF_ATTRIBUTE_NAME_MISMATCH;
import static org.forgerock.opendj.ldap.CoreMessages.ERR_LDIF_BAD_CHANGE_TYPE;
@@ -133,7 +134,6 @@
*/
public static ChangeRecord valueOfLDIFChangeRecord(final String... ldifLines) {
// LDIF change record reader is tolerant to missing change types.
- @SuppressWarnings("resource")
final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(ldifLines);
try {
if (!reader.hasNext()) {
@@ -161,6 +161,8 @@
final LocalizableMessage message =
WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e.getMessage());
throw new LocalizedIllegalArgumentException(message);
+ } finally {
+ closeSilently(reader);
}
}
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
index 878a3e8..1aa244c 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
@@ -27,6 +27,7 @@
package org.forgerock.opendj.ldif;
+import static com.forgerock.opendj.util.StaticUtils.closeSilently;
import static org.forgerock.opendj.ldap.CoreMessages.ERR_LDIF_ENTRY_EXCLUDED_BY_DN;
import static org.forgerock.opendj.ldap.CoreMessages.ERR_LDIF_ENTRY_EXCLUDED_BY_FILTER;
import static org.forgerock.opendj.ldap.CoreMessages.WARN_READ_LDIF_RECORD_MULTIPLE_CHANGE_RECORDS_FOUND;
@@ -79,7 +80,6 @@
* If {@code ldifLines} was {@code null}.
*/
public static Entry valueOfLDIFEntry(final String... ldifLines) {
- @SuppressWarnings("resource")
final LDIFEntryReader reader = new LDIFEntryReader(ldifLines);
try {
if (!reader.hasNext()) {
@@ -107,6 +107,8 @@
final LocalizableMessage message =
WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e.getMessage());
throw new LocalizedIllegalArgumentException(message);
+ } finally {
+ closeSilently(reader);
}
}
--
Gitblit v1.10.0