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

Fixed version requirement / version check mismatch.

Browse source 
Although requiring a higher version of Java, this was not yet checked
correctly in the code.
This commit is contained in:
Daniel Ruthardt 2017-08-14 17:50:37 +02:00 • committed by Tobi Schäfer
parent 7f3bb3a85b
commit 468a89bd05
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,11 +145,13 @@ public class Server implements Runnable {
public static void checkJavaVersion() { public static void checkJavaVersion() {
String javaVersion = System.getProperty("java.version"); String javaVersion = System.getProperty("java.version");
if ((javaVersion == null) || javaVersion.startsWith("1.3") if ((javaVersion == null) || javaVersion.startsWith("1.5")
|| javaVersion.startsWith("1.4")
|| javaVersion.startsWith("1.3")
|| javaVersion.startsWith("1.2") || javaVersion.startsWith("1.2")
|| javaVersion.startsWith("1.1") || javaVersion.startsWith("1.1")
|| javaVersion.startsWith("1.0")) { || javaVersion.startsWith("1.0")) {
System.err.println("This version of Helma requires Java 1.4 or greater."); System.err.println("This version of Helma requires Java 1.6 or greater.");
if (javaVersion == null) { // don't think this will ever happen, but you never know if (javaVersion == null) { // don't think this will ever happen, but you never know
System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version."); System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version.");