From 31153ccec78ed6187b9543babccdaf996968d6bb Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 01 May 2007 17:20:27 +0000
Subject: [PATCH] Fix for issue #1262: database becomes empty when importing a not existing ldif file.
---
opends/src/server/org/opends/server/tools/ImportLDIF.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opends/src/server/org/opends/server/tools/ImportLDIF.java
index 1a585f5..274fff4 100644
--- a/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -61,7 +61,7 @@
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Error.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -858,6 +858,20 @@
if (ldifFiles.isPresent())
{
ArrayList<String> fileList = new ArrayList<String>(ldifFiles.getValues());
+ int badFileCount = 0;
+ for (String pathname : fileList)
+ {
+ File f = new File(pathname);
+ if (!f.canRead())
+ {
+ int msgID = MSGID_LDIFIMPORT_CANNOT_READ_FILE;
+ String message = getMessage(msgID, pathname);
+ logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
+ message, msgID);
+ badFileCount++;
+ }
+ }
+ if (badFileCount > 0) return 1;
importConfig = new LDIFImportConfig(fileList);
}
else
--
Gitblit v1.10.0