summaryrefslogtreecommitdiff
path: root/BKUWebStart/src/main/java/at/gv
diff options
context:
space:
mode:
Diffstat (limited to 'BKUWebStart/src/main/java/at/gv')
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
index 5e4ab634..abc0b8ee 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java
@@ -152,11 +152,19 @@ public class BKULauncher implements BKUControllerInterface {
*/
private boolean updateRequired(String oldVersion, String newVersion) {
if (oldVersion != null) {
+ log.debug("comparing " + oldVersion + " to " + MIN_CONFIG_VERSION);
+
int majorEnd = oldVersion.indexOf('-');
- if (majorEnd > 0) {
- oldVersion = oldVersion.substring(0, majorEnd);
+ String oldMajor = (majorEnd < 0) ? oldVersion : oldVersion.substring(0, majorEnd);
+
+ int compare = oldMajor.compareTo(MIN_CONFIG_VERSION);
+ if (compare < 0 ||
+ // SNAPSHOT versions are pre-releases (update if release required)
+ (compare == 0 && oldVersion.startsWith("-SNAPSHOT", majorEnd))) {
+ return true;
+ } else {
+ return false;
}
- return (oldVersion.compareTo(MIN_CONFIG_VERSION) < 0);
}
log.debug("no old version, update required");
return true;