commit 39f924a42efe4b604bdac25015f891b29290a2af
author Carsten Ziegeler <cziegeler@apache.org> Mon Feb 19 17:19:35 2018 +0100
committer GitHub <noreply@github.com> Mon Feb 19 17:19:35 2018 +0100
tree ea833fafcb31bd39d7902da959eb66f21dbe2d0b
parent 30ed8994a0e7b2173eb1a1d38bb133ca84848af0
parent 1d4feb2d5bf1377f9398ef79a6d9afe0d46538ba

Merge pull request #2 from bosschaert/SLING-7496-2

SLING-7496 Factory config deleted with ConfigAdmin immediately after creation

src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java

diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
index c5f4d1d..a1d628a 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
@@ -80,7 +80,12 @@
         if ( this.aliasPid == null || this.factoryPid == null ) {
             return null;
         }
-        final String alias = factoryPid + "." + this.aliasPid;
+        final String alias;
+        if (this.aliasPid.startsWith(this.factoryPid)) {
+            alias = this.aliasPid;
+        } else {
+            alias = this.factoryPid + "." + this.aliasPid;
+        }
         final int pos = this.getResource().getEntityId().indexOf(':');
         if ( this.getResource().getEntityId().substring(pos + 1).equals(alias) ) {
             return null;