From d1b2ccab3764bc213af1a527e54df4d81812ca12 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 23 Jan 2008 00:01:15 +0000
Subject: [PATCH] Use more specific messages when getting an error when creating or deleting the database directories.

---
 opends/src/server/org/opends/server/backends/jeb/EnvManager.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/jeb/EnvManager.java b/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
index 64aa3af..0ae0835 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 import org.opends.messages.Message;
@@ -30,10 +30,7 @@
 import static org.opends.server.loggers.debug.DebugLogger.*;
 import org.opends.server.loggers.debug.DebugTracer;
 import org.opends.server.types.DebugLogLevel;
-import static org.opends.messages.JebMessages.ERR_JEB_CREATE_FAIL;
-import static org.opends.messages.JebMessages.
-     ERR_JEB_DIRECTORY_INVALID;
-import static org.opends.messages.JebMessages.ERR_JEB_REMOVE_FAIL;
+import static org.opends.messages.JebMessages.*;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -115,12 +112,18 @@
    * The environment must not be open.
    *
    * @param homeDir The backend home directory
-   * @throws JebException If an error occurs in the JE backend.
+   * @throws JebException If an error occurs in the JE backend or if the
+   * specified home directory does not exist.
    */
   public static void removeFiles(String homeDir)
        throws JebException
   {
     File dir = new File(homeDir);
+    if (!dir.exists())
+    {
+      Message message = ERR_JEB_DIRECTORY_DOES_NOT_EXIST.get(homeDir);
+      throw new JebException(message);
+    }
     if (!dir.isDirectory())
     {
       Message message = ERR_JEB_DIRECTORY_INVALID.get(homeDir);

--
Gitblit v1.10.0