X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2Fa2%2FFsA2Source.java;h=6fc25c1127f98d8adf93d390b6e072d99ae15b8f;hb=6d6fd0f20eda4331d35e7beb5d14aacdb3a98ad8;hp=b9f9193ffa512e4c4f0eaab7a7dd060118478350;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java index b9f9193ff..6fc25c112 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java @@ -54,9 +54,12 @@ public class FsA2Source extends ProvisioningSource { version = new Version(versionStr); } catch (Exception e) { versionStr = readVersionFromModule(modulePath); - version = new Version(versionStr); - // OsgiBootUtils.debug("Ignore " + modulePath + " (" + e.getMessage() + ")"); - // continue modules; + if (versionStr != null) { + version = new Version(versionStr); + } else { + OsgiBootUtils.debug("Ignore " + modulePath + " (" + e.getMessage() + ")"); + continue modules; + } } A2Component component = contribution.getOrAddComponent(componentName); A2Module module = component.getOrAddModule(version, modulePath); @@ -71,7 +74,7 @@ public class FsA2Source extends ProvisioningSource { public static void main(String[] args) { try { FsA2Source context = new FsA2Source(Paths.get( - "/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.74-SNAPSHOT/argeo-node/share/osgi")); + "/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.77-SNAPSHOT/share/osgi")); context.load(); context.asTree(); } catch (Exception e) {