From fdd9be22de1808af9159a95ae6dd64e6573f5310 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 29 Mar 2013 14:49:41 +0000
Subject: [PATCH] Very minor code cleanup to LDIF package:
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
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 1be1abb..878a3e8 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
@@ -22,15 +22,20 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldif;
-import static org.forgerock.opendj.ldap.CoreMessages.*;
+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;
+import static org.forgerock.opendj.ldap.CoreMessages.WARN_READ_LDIF_RECORD_NO_CHANGE_RECORD_FOUND;
+import static org.forgerock.opendj.ldap.CoreMessages.WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@@ -134,6 +139,19 @@
}
/**
+ * Creates a new LDIF entry reader whose source is the provided character
+ * stream reader.
+ *
+ * @param reader
+ * The character stream reader to use.
+ * @throws NullPointerException
+ * If {@code reader} was {@code null}.
+ */
+ public LDIFEntryReader(final Reader reader) {
+ super(reader);
+ }
+
+ /**
* Creates a new LDIF entry reader which will read lines of LDIF from the
* provided array of LDIF lines.
*
@@ -366,8 +384,10 @@
}
try {
- // Read the DN of the entry and see if it is one that should be
- // included in the import.
+ /*
+ * Read the DN of the entry and see if it is one that should be
+ * included in the import.
+ */
final DN entryDN = readLDIFRecordDN(record);
if (entryDN == null) {
// Skip version record.
--
Gitblit v1.10.0