commit 4dd112ce22737daa8027a9ce629c17952723d293
author Jean-Baptiste Onofré <jbonofre@apache.org> Tue Oct 20 08:23:53 2020 +0200
committer GitHub <noreply@github.com> Tue Oct 20 08:23:53 2020 +0200
tree 364af11264be338cd81cbeb656e882e2aefbae6f
parent 8145dc352df7c58ff15f85a461a30b27ed063164
parent 2c64ad2cb7bbd446fcd62d4694ac595f3d69bbea

Merge pull request #1238 from jbonofre/KARAF-6716

[KARAF-6716] Fallback to root subsystem when getting region if target subsystem is null

features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java

diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
index f08efaa..e4d1c69 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolveContext.java
@@ -267,7 +267,10 @@
     }
 
     private Region getRegion(Resource resource) {
-        return regions.get(getSubsystem(resource).getName());
+        if (getSubsystem(resource) != null) {
+            return regions.get(getSubsystem(resource).getName());
+        }
+        return regions.get(root.getName());
     }
 
     @Override