[karaf] branch master updated: [KARAF-6716] Fallback to root subsystem when getting region if target subsystem is null

[jb...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2c64ad2  [KARAF-6716] Fallback to root subsystem when getting region if target subsystem is null
     new 4dd112c  Merge pull request #1238 from jbonofre/KARAF-6716
2c64ad2 is described below

commit 2c64ad2cb7bbd446fcd62d4694ac595f3d69bbea
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Oct 19 15:20:44 2020 +0200

    [KARAF-6716] Fallback to root subsystem when getting region if target subsystem is null
---
 .../karaf/features/internal/region/SubsystemResolveContext.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@ public class SubsystemResolveContext extends ResolveContext {
     }
 
     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