*/
public enum Step
{
- UPDATE_JAVA(10),
+ //UPDATE_JAVA(10),
+ UPDATE_JAVA(20),
//VERIFY_METADATA(15, 65, 95),
VERIFY_METADATA(15, 45, 90),
- DOWNLOAD(50),
+ DOWNLOAD(60),
PATCH(60),
//VERIFY_RESOURCES(70, 97),
- VERIFY_RESOURCES(30, 90),
+ VERIFY_RESOURCES(40, 90),
//REDOWNLOAD_RESOURCES(90),
- REDOWNLOAD_RESOURCES(75),
+ REDOWNLOAD_RESOURCES(80),
//UNPACK(98),
UNPACK(95),
//LAUNCH(99);
_envc = envc;
_config = getLocalPath(envc.appDir, CONFIG_FILE);
_backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
- log.warning("Backup config file now", "_backupConfig", _backupConfig, "exists", _backupConfig.exists(), "isReadable", _backupConfig.canRead());
}
/**
*/
public Resource getConfigResource ()
{
- Resource res = null;
try {
return createResource(CONFIG_FILE, Resource.NORMAL);
} catch (Exception e) {
- log.warning("Invalid appbase '" + _vappbase + "'.", e);
+ throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
}
}
ARG: for (int i = 0; i < _jvmargs.size(); i++) {
if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) {
_jvmargs.remove(i);
+ break ARG;
}
}
addAll(maxMemHeapArg, _jvmargs);
+ log.info("Max memory set", "maxMemHeapArg", maxMemHeapArg[0]);
}
} else if (jvmmempc != -1) {
- System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
+ log.warning("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
}
// get the set of optimum JVM arguments
if (j > -1) {
ext = filename.substring(j+1);
}
- if (LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+ if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
// this file extension should have been dealt with in Getdown class
} else {
_appargs.add(0, "-open");