diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-12-28 14:48:28 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-12-28 14:48:28 +0000 |
| commit | 7dd97036bf0bb830e374033de38c040e55e5a694 (patch) | |
| tree | 36630c0be958774fd1b9c60f7d8d4c27103a766e /BKUWebStart/src/main/java/at | |
| parent | dfd5ba8d8b4253b786a71eebdb134be7fc8318f9 (diff) | |
| download | mocca-7dd97036bf0bb830e374033de38c040e55e5a694.tar.gz mocca-7dd97036bf0bb830e374033de38c040e55e5a694.tar.bz2 mocca-7dd97036bf0bb830e374033de38c040e55e5a694.zip | |
branches might add non-numerical values after minor version
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@869 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUWebStart/src/main/java/at')
| -rw-r--r-- | BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java index c33d6f08..2cf5db79 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java @@ -266,7 +266,7 @@ public class Configurator { int majorEndOld = oldVersion.indexOf("-SNAPSHOT"); // 1.0.10-SNAPSHOT-r438, 1.2.12-pinguin-1-SNAPSHOT-r635 if (majorEndOld < 0) { preRelease = false; - majorEndOld = oldVersion.lastIndexOf('-'); // 1.0.10-r439, 1.2.12-pinguin-1-r635 + majorEndOld = oldVersion.lastIndexOf('-'); // 1.0.10-r439, 1.2.12-pinguin-1-r635, 1.3.0-RC2-r611 if (majorEndOld < 0) { majorEndOld = oldVersion.length(); } @@ -282,7 +282,13 @@ public class Configurator { } } - xOld = Integer.valueOf(oldVersion.substring(fromInd, majorEndOld)); + try { + xOld = Integer.valueOf(oldVersion.substring(fromInd, majorEndOld)); + } catch (NumberFormatException ex) { + log.warn("{} seems to be a branch version, do not update", oldVersion); + log.debug(ex.getMessage(), ex); + return false; + } boolean hasMoreDigitsMin = true; nextIndMin = minVersion.indexOf('.', fromInd); if (nextIndMin < 0) { |