Ignore the snapshot suffix when searching for proper OSGi version identifier
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Sun, 17 Apr 2016 07:40:34 +0200
changeset 1921aed8434561fc
parent 1920 6cfab6c60fba
child 1922 2d4597793958
Ignore the snapshot suffix when searching for proper OSGi version identifier
launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java
     1.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Sun Apr 17 07:15:28 2016 +0200
     1.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Sun Apr 17 07:40:34 2016 +0200
     1.3 @@ -712,7 +712,11 @@
     1.4                  for (ClassLoader loader : loaders) {
     1.5                      for (String[] lib : libraries) {
     1.6                          Object[] urlVersion = osgiJars.get(lib[4]);
     1.7 -                        if (urlVersion != null && urlVersion[1].toString().startsWith(lib[2])) {
     1.8 +                        String expectVersion = lib[2];
     1.9 +                        if (expectVersion.endsWith("-SNAPSHOT")) {
    1.10 +                            expectVersion = expectVersion.substring(0, expectVersion.length() - 9);
    1.11 +                        }
    1.12 +                        if (urlVersion != null && urlVersion[1].toString().startsWith(expectVersion)) {
    1.13                              precompiled = loader.getResource(lib[3]);
    1.14                          }
    1.15                      }