Skip to content

Commit

Permalink
Fix issue with starting Saiku in PCs with no JAVA_HOME environment
Browse files Browse the repository at this point in the history
variable
  • Loading branch information
herrtunante committed Oct 30, 2015
1 parent e48867e commit cc1adae
Showing 1 changed file with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ private boolean isSaikuConfigured() {
return getSaikuFolder() != null && isSaikuFolder(new File(getSaikuFolder()));
}

private boolean isJavaHomeConfigured() {
/*private boolean isJavaHomeConfigured() {
if (SystemUtils.IS_OS_MAC){
return true;
Expand All @@ -474,7 +474,7 @@ private boolean isJavaHomeConfigured() {
&&
StringUtils.isBlank( System.getenv("COLLECT_EARTH_JRE_HOME") ) //$NON-NLS-1$
);
}
}*/


public boolean isSaikuFolder(File saikuFolder) {
Expand Down Expand Up @@ -734,9 +734,12 @@ private void removeOldRdb() {
private void runSaikuBat(String commandName) throws SaikuExecutionException {
if (!isSaikuConfigured()) {
throw new SaikuExecutionException("The Saiku server is not configured."); //$NON-NLS-1$
} else if (!isJavaHomeConfigured()) {
}
/* Commented out : the Java Home variable is not necessary any more in order to run Saiku as the path to the Java Runtime Environment distributed with Collect Earth is hardcoded on the bat/sh files
else if (!isJavaHomeConfigured()) {
throw new SaikuExecutionException("The JAVA_HOME environment variable is not configured. JAVA_HOME must point to the root folder of a valid JDK."); //$NON-NLS-1$
} else {
} */
else {
String saikuCmd = getSaikuFolder() + File.separator + commandName + getCommandSuffix() ;

if (SystemUtils.IS_OS_WINDOWS){
Expand Down

0 comments on commit cc1adae

Please sign in to comment.