From: Mathieu Baudier Date: Sat, 29 Oct 2022 07:18:57 +0000 (+0200) Subject: Do not override singleton when it is unnecessary. X-Git-Tag: v2.3.4~12 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=5780358cbe118241527a5813055fa2a277ef78bc;p=cc0%2Fargeo-build.git Do not override singleton when it is unnecessary. --- diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 9312320..df63005 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -802,8 +802,9 @@ public class Repackage { Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); Files.createDirectories(manifestPath.getParent()); - if (isSingleton) { - entries.put(BUNDLE_SYMBOLICNAME.toString(), nameVersion.getName() + "; singleton:=true"); + if (isSingleton && entries.containsKey(BUNDLE_SYMBOLICNAME.toString())) { + entries.put(BUNDLE_SYMBOLICNAME.toString(), + entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true"); } for (String key : entries.keySet()) {