From 5ad4cfcbae12c9461f5da603b9890648a4cdb169 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 25 Feb 2009 09:35:20 +0000
Subject: [PATCH] Fix for issue #3802 (script launcher return codes are not correct)
---
opends/src/server/org/opends/server/tools/configurator/CheckInstance.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java b/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
index f4b74b3..6c4e57b 100644
--- a/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
+++ b/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
@@ -45,7 +45,6 @@
import org.opends.quicksetup.QuickSetupLog;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.server.util.DynamicConstants.*;
@@ -114,12 +113,14 @@
installRootFromSystem = System.getProperty("INSTALL_ROOT");
if (installRootFromSystem == null) {
- System.err.println("INSTALL_ROOT property not specified");
+ System.err
+ .println(ERR_INTERNAL.get(ERR_INSTALL_ROOT_NOT_SPECIFIED.get()));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
instanceRootFromSystem = System.getProperty("INSTANCE_ROOT");
if (instanceRootFromSystem == null) {
- System.err.println("INSTANCE_ROOT property not specified");
+ System.err.println(ERR_INTERNAL
+ .get(ERR_INSTANCE_ROOT_NOT_SPECIFIED.get()));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
@@ -139,7 +140,7 @@
INFO_CHECK_DESCRIPTION_CHECK_VERSION.get());
argParser.addArgument(checkVersionArg);
} catch (ArgumentException ae) {
- System.err.println(ae.getMessageObject());
+ System.err.println(ERR_INTERNAL.get(ae.getMessageObject()));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
@@ -148,7 +149,7 @@
try {
argParser.parseArguments(args);
} catch (ArgumentException ae) {
- System.err.println(ae.getMessageObject());
+ System.err.println(ERR_INTERNAL.get(ae.getMessageObject()));
System.exit(ARGS_ERROR);
}
@@ -174,13 +175,19 @@
exit = proc.exitValue();
if (exit != 0) {
LOG.log(Level.FINEST, cmd + " error= " + exit);
+ System.err.println(ERR_CONFIG_LDIF_NOT_FOUND.get(conf.getAbsolutePath(),
+ installRootFromSystem + File.separator + "instance.loc"));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
} catch (InterruptedException ex) {
LOG.log(Level.SEVERE, "InterruptedException" + ex.getMessage());
+ System.err.println(ERR_CONFIG_LDIF_NOT_FOUND.get(conf.getAbsolutePath(),
+ installRootFromSystem + File.separator + "instance.loc"));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
} catch (IOException ex) {
LOG.log(Level.SEVERE, "IOException" + ex.getMessage() );
+ System.err.println(ERR_CONFIG_LDIF_NOT_FOUND.get(conf.getAbsolutePath(),
+ installRootFromSystem + File.separator + "instance.loc"));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
@@ -197,14 +204,17 @@
LOG.log(Level.FINEST, "instanceOwner=[" + instanceOwner + "]");
} else {
LOG.log(Level.SEVERE, "no instanceOwner");
+ System.err.println(ERR_INTERNAL.get(Message.raw("no instanceOwner")));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
} else {
LOG.log(Level.SEVERE, "no inode");
+ System.err.println(ERR_INTERNAL.get(Message.raw("no inode")));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
} else {
LOG.log(Level.SEVERE, "no access rights");
+ System.err.println(ERR_INTERNAL.get(Message.raw("no access rights")));
System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
}
--
Gitblit v1.10.0