From 6d6fd0f20eda4331d35e7beb5d14aacdb3a98ad8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 16 Sep 2019 11:31:24 +0200 Subject: [PATCH] Make OSGi boot more robust against badly formatted bundles. --- .../src/org/argeo/osgi/boot/a2/FsA2Source.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 1072a1149..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); -- 2.30.2