From 64bcd06431264ed39366ea63f3f14985d3a1e669 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 25 Jun 2008 15:34:06 +0000
Subject: [PATCH] Check that the path where we must store the equivalent command-lines is not an existing directory.
---
opendj-sdk/opends/src/messages/messages/dsconfig.properties | 4 ++++
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 10 ++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/dsconfig.properties b/opendj-sdk/opends/src/messages/messages/dsconfig.properties
index 98e28f4..ce1f69e 100644
--- a/opendj-sdk/opends/src/messages/messages/dsconfig.properties
+++ b/opendj-sdk/opends/src/messages/messages/dsconfig.properties
@@ -462,3 +462,7 @@
%s. Error details: %s
SEVERE_ERR_DSCFG_CANNOT_WRITE_EQUIVALENT_COMMAND_LINE_FILE_155=Cannot write \
to file %s. Verify that you have access rights to that file
+SEVERE_ERR_DSCFG_EQUIVALENT_COMMAND_LINE_FILE_DIRECTORY_156=The specified \
+ path %s to write the equivalent command is a directory. You must specify a \
+ path to a file
+
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 57e8843..53e1bb1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -36,6 +36,7 @@
import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -759,6 +760,15 @@
println(ERR_DSCFG_CANNOT_WRITE_EQUIVALENT_COMMAND_LINE_FILE.get(file));
return 1;
}
+ else
+ {
+ File f = new File(file);
+ if (f.isDirectory())
+ {
+ println(ERR_DSCFG_EQUIVALENT_COMMAND_LINE_FILE_DIRECTORY.get(file));
+ return 1;
+ }
+ }
}
// Make sure that management context's arguments are valid.
--
Gitblit v1.10.0