From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 16 Oct 2023 07:33:50 +0000 (+0200)
Subject: Use locator path as OSGi installation string
X-Git-Tag: v2.3.20~9
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=88fd398d2939ab9030274ff822db8a46b32d6a96;p=lgpl%2Fargeo-commons.git

Use locator path as OSGi installation string
---

diff --git a/org.argeo.init/src/org/argeo/init/a2/AbstractProvisioningSource.java b/org.argeo.init/src/org/argeo/init/a2/AbstractProvisioningSource.java
index 617e78878..800635c9e 100644
--- a/org.argeo.init/src/org/argeo/init/a2/AbstractProvisioningSource.java
+++ b/org.argeo.init/src/org/argeo/init/a2/AbstractProvisioningSource.java
@@ -47,17 +47,19 @@ public abstract class AbstractProvisioningSource implements ProvisioningSource {
 				Bundle bundle = bc.installBundle(referenceUrl);
 				return bundle;
 			} else {
-
-				Path tempJar = null;
-				if (locator instanceof Path && Files.isDirectory((Path) locator))
-					tempJar = toTempJar((Path) locator);
+				Path locatorPath = (Path) locator;
+				Path pathToUse;
+				if (locator instanceof Path && Files.isDirectory(locatorPath))
+					pathToUse = toTempJar(locatorPath);
+				else
+					pathToUse = locatorPath;
 				Bundle bundle;
-				try (InputStream in = newInputStream(tempJar != null ? tempJar : locator)) {
-					bundle = bc.installBundle(module.getBranch().getCoordinates(), in);
+				try (InputStream in = newInputStream(pathToUse)) {
+					bundle = bc.installBundle(locatorPath.toAbsolutePath().toString(), in);
 				}
 
-				if (tempJar != null)
-					Files.deleteIfExists(tempJar);
+				if (pathToUse != null)
+					Files.deleteIfExists(pathToUse);
 				return bundle;
 			}
 		} catch (BundleException | IOException e) {