From 6af27032f03ac2b79aa92b20cbf6094d553a22b7 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 12 Oct 2006 05:27:32 +0000
Subject: [PATCH] Update code in the org.opends.server.util package to use the Validator.ensureNotNull method for arguments that are not allowed to be null, and also update the javadoc for the corresponding @param tags to indicate this.
---
opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
index 8b0574e..c190dab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
@@ -33,6 +33,7 @@
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.UtilityMessages.*;
import static org.opends.server.util.StaticUtils.toLowerCase;
+import static org.opends.server.util.Validator.*;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -127,7 +128,8 @@
* Creates a new LDIF reader that will read information from the specified
* file.
*
- * @param importConfig The import configuration for this LDIF reader.
+ * @param importConfig The import configuration for this LDIF reader. It
+ * must not be <CODE>null</CODE>.
*
* @throws IOException If a problem occurs while opening the LDIF file for
* reading.
@@ -137,6 +139,7 @@
{
assert debugConstructor(CLASS_NAME, String.valueOf(importConfig));
+ ensureNotNull(importConfig);
this.importConfig = importConfig;
reader = importConfig.getReader();
@@ -1058,9 +1061,12 @@
{
try
{
- rejectWriter.write("# ");
- rejectWriter.write(message);
- rejectWriter.newLine();
+ if ((message != null) && (message.length() > 0))
+ {
+ rejectWriter.write("# ");
+ rejectWriter.write(message);
+ rejectWriter.newLine();
+ }
for (StringBuilder sb : lastEntryHeaderLines)
{
@@ -1308,8 +1314,8 @@
}
}
- return new ModifyDNChangeRecordEntry(entryDN, newSuperiorDN,
- newRDN, deleteOldRDN);
+ return new ModifyDNChangeRecordEntry(entryDN, newRDN, deleteOldRDN,
+ newSuperiorDN);
}
--
Gitblit v1.10.0