From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index bd333a9..7b9464f 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -36,7 +36,8 @@
/**
* This is the only class that uses classes in org.opends.server (excluding the
- * case of org.opends.server.util.DynamicConstants which is already included in
+ * case of org.opends.server.util.DynamicConstants and
+ * org.opends.server.util.SetupUtils which are already included in
* quicksetup.jar).
*
* Important note: do not include references to the classes in package
@@ -83,14 +84,14 @@
MSGID_DIRECTORY_SERVER_STARTED);
}
- private String getExceptionMsg(String key, Exception ex)
+ private String getThrowableMsg(String key, Throwable t)
{
- return getExceptionMsg(key, null, ex);
+ return getThrowableMsg(key, null, t);
}
- private String getExceptionMsg(String key, String[] args, Exception ex)
+ private String getThrowableMsg(String key, String[] args, Throwable t)
{
- return Utils.getExceptionMsg(ResourceProvider.getInstance(), key, args, ex);
+ return Utils.getThrowableMsg(ResourceProvider.getInstance(), key, args, t);
}
/**
@@ -109,7 +110,7 @@
ldifFile.deleteOnExit();
} catch (IOException ioe)
{
- String failedMsg = getExceptionMsg("error-creating-temp-file", null, ioe);
+ String failedMsg = getThrowableMsg("error-creating-temp-file", null, ioe);
throw new InstallException(InstallException.Type.FILE_SYSTEM_ERROR,
failedMsg, ioe);
}
@@ -134,19 +135,19 @@
} catch (org.opends.server.types.DirectoryException de)
{
throw new InstallException(InstallException.Type.CONFIGURATION_ERROR,
- getExceptionMsg("error-importing-ldif", null, de), de);
+ getThrowableMsg("error-importing-ldif", null, de), de);
} catch (org.opends.server.util.LDIFException le)
{
throw new InstallException(InstallException.Type.CONFIGURATION_ERROR,
- getExceptionMsg("error-importing-ldif", null, le), le);
+ getThrowableMsg("error-importing-ldif", null, le), le);
} catch (IOException ioe)
{
throw new InstallException(InstallException.Type.CONFIGURATION_ERROR,
- getExceptionMsg("error-importing-ldif", null, ioe), ioe);
- } catch (RuntimeException re)
+ getThrowableMsg("error-importing-ldif", null, ioe), ioe);
+ } catch (Throwable t)
{
- throw new InstallException(InstallException.Type.BUG, getExceptionMsg(
- "bug-msg", re), re);
+ throw new InstallException(InstallException.Type.BUG, getThrowableMsg(
+ "bug-msg", t), t);
}
return ldifFile;
}
--
Gitblit v1.10.0