[karaf] branch main updated: [KARAF-6074] Prevent duplicate PIDs from factory PID defined in feature config

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new f5ee79652d [KARAF-6074] Prevent duplicate PIDs from factory PID 
defined in feature config
     new ee957b83af Merge pull request #1720 from grgrzybek/KARAF-6074
f5ee79652d is described below

commit f5ee79652dfc3f8d8c25620abce60910b63c55da
Author: Grzegorz Grzybek <ggrzy...@redhat.com>
AuthorDate: Thu Jun 1 11:48:14 2023 +0200

    [KARAF-6074] Prevent duplicate PIDs from factory PID defined in feature 
config
---
 .../karaf/features/internal/service/FeatureConfigInstaller.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
index a4e99668f6..7d530ae4e6 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
@@ -68,9 +68,7 @@ public class FeatureConfigInstaller {
         if (n > 0) {
             cid.isFactoryPid = true;
             cid.factoryPid = pid.substring(0, n);
-            if (pid.contains("~")) {
-                cid.name = pid.substring(n + 1);
-            }
+            cid.name = pid.substring(n + 1);
         }
         return cid;
     }