antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

fixed possible NullPointerException when called without homedir-setting

Browse source 
changed order in parseArgs()
This commit is contained in:
stefanp 2004-01-05 13:23:14 +00:00
parent 50be1bb115
commit 4e36815f61
1 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/helma/main/Server.java
View file

@ -116,7 +116,7 @@ public class Server implements IPathElement, Runnable {
try { try {
config = parseArgs(args); config = parseArgs(args);
} catch (Exception cex) { } catch (Exception cex) {
printUsageError(cex.toString()); printUsageError("error reading configuration: " + cex.getMessage());
System.exit(1); System.exit(1);
} }
@ -171,6 +171,7 @@ public class Server implements IPathElement, Runnable {
Config config = new Config(); Config config = new Config();
// get possible environment setting for helma home
if (System.getProperty("helma.home")!=null) { if (System.getProperty("helma.home")!=null) {
config.homeDir = new File(System.getProperty("helma.home")); config.homeDir = new File(System.getProperty("helma.home"));
} }
@ -213,8 +214,10 @@ public class Server implements IPathElement, Runnable {
} }
} }
// get main property file from home dir or vice versa, depending on what we have. // get main property file from home dir or vice versa,
// get property file from hopHome // depending on what we have:
// get property file from hopHome:
if (config.propFile == null) { if (config.propFile == null) {
if (config.homeDir != null) { if (config.homeDir != null) {
config.propFile = new File(config.homeDir, "server.properties"); config.propFile = new File(config.homeDir, "server.properties");
@ -223,9 +226,38 @@ public class Server implements IPathElement, Runnable {
} }
} }
// create system properties // create system properties
SystemProperties sysProps = new SystemProperties(config.propFile.getAbsolutePath()); SystemProperties sysProps = new SystemProperties(config.propFile.getAbsolutePath());
// try to get hopHome from property file
if (config.homeDir == null && sysProps.getProperty("hophome") != null) {
config.homeDir = new File(sysProps.getProperty("hophome"));
}
// use the directory where server.properties is located:
if (config.homeDir == null && config.propFile != null) {
// config.homeDir = config.propFile.getAbsoluteFile().getParentFile();
config.homeDir = config.propFile.getParentFile();
}
if (!config.hasPropFile()) {
throw new Exception ("no server.properties found");
}
if (!config.hasHomeDir()) {
throw new Exception ("couldn't determine helma directory");
}
// try to transform hopHome directory to its canonical representation
try {
config.homeDir = config.homeDir.getCanonicalFile();
} catch (IOException iox) {
config.homeDir = config.homeDir.getAbsoluteFile();
}
// check if there's a property setting for those ports not specified via command line // check if there's a property setting for those ports not specified via command line
if ((config.websrvPort == null) && (sysProps.getProperty("webPort") != null)) { if ((config.websrvPort == null) && (sysProps.getProperty("webPort") != null)) {
try { try {
@ -259,22 +291,6 @@ public class Server implements IPathElement, Runnable {
} }
} }
// get hopHome from property file
if (config.homeDir == null) {
config.homeDir = new File(sysProps.getProperty("hophome"));
}
if (config.homeDir == null) {
config.homeDir = new File(config.propFile.getParent());
}
// try to transform hopHome directory to its canonical representation
try {
config.homeDir = config.homeDir.getCanonicalFile();
} catch (IOException iox) {
config.homeDir = config.homeDir.getAbsoluteFile();
}
return config; return config;
} }