karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: KARAF-4155 - Fall back to feature start-level
Date Tue, 01 Dec 2015 06:50:05 GMT
Repository: karaf
Updated Branches:
  refs/heads/master d02c8b1d6 -> 0de98181f


KARAF-4155 - Fall back to feature start-level


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0de98181
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0de98181
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0de98181

Branch: refs/heads/master
Commit: 0de98181fb67885a120bea26fea1c8d7299027cf
Parents: d02c8b1
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Dec 1 07:49:25 2015 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Dec 1 07:49:25 2015 +0100

----------------------------------------------------------------------
 .../org/apache/karaf/features/internal/region/Subsystem.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0de98181/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
index a449e16..0f3d39a 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
@@ -434,10 +434,11 @@ public class Subsystem extends ResourceImpl {
                 final String loc = bi.getLocation();
                 final Conditional cond = entry.getValue();
                 ResourceImpl res = bundles.get(loc);
+                int sl = bi.getStartLevel() <= 0 ? feature.getStartLevel() : bi.getStartLevel();
                 if (bi.isDependency()) {
-                    addDependency(res, false, bi.isStart(), bi.getStartLevel());
+                    addDependency(res, false, bi.isStart(), sl);
                 } else {
-                    doAddDependency(res, cond == null, bi.isStart(), bi.getStartLevel());
+                    doAddDependency(res, cond == null, bi.isStart(), sl);
                 }
                 if (cond != null) {
                     addIdentityRequirement(res, resConds.get(cond), true);


Mime
View raw message