You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/11/23 15:57:27 UTC
[1/2] karaf git commit: [KARAF-4139] Make sure lazy bundles also start
Repository: karaf
Updated Branches:
refs/heads/master a9ce45412 -> 9ebb25a9d
[KARAF-4139] Make sure lazy bundles also start
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/210af293
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/210af293
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/210af293
Branch: refs/heads/master
Commit: 210af29312197178a44c03ea1b439ce63a1c83fa
Parents: a9ce454
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Nov 23 15:41:26 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Nov 23 15:41:26 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/features/internal/service/Deployer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/210af293/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 178360a..e71386d 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -823,7 +823,7 @@ public class Deployer {
callback.resolveBundles(toResolve, resolver.getWiring(), deployment.resToBnd);
// Compute bundles to start
- removeFragmentsAndBundlesInState(toStart, UNINSTALLED | ACTIVE | STARTING);
+ removeFragmentsAndBundlesInState(toStart, UNINSTALLED | ACTIVE);
if (!toStart.isEmpty()) {
// Compute correct start order
List<Exception> exceptions = new ArrayList<>();
[2/2] karaf git commit: Avoid NPE
Posted by cs...@apache.org.
Avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ebb25a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ebb25a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ebb25a9
Branch: refs/heads/master
Commit: 9ebb25a9d7578d7ee278f26c4fddd851c669a651
Parents: 210af29
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Nov 23 15:42:59 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Nov 23 15:42:59 2015 +0100
----------------------------------------------------------------------
.../org/apache/karaf/features/internal/service/Deployer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ebb25a9/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index e71386d..aded8af 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -727,8 +727,8 @@ public class Deployer {
&& isUpdateable(resource) && !deployment.bundleChecksums.containsKey(bundle.getBundleId())) {
deployment.bundleChecksums.put(bundle.getBundleId(), crc);
}
- int startLevel = startLevels.get(resource);
- if (startLevel != dstate.initialBundleStartLevel) {
+ Integer startLevel = startLevels.get(resource);
+ if (startLevel != null && startLevel != dstate.initialBundleStartLevel) {
callback.setBundleStartLevel(bundle, startLevel);
}
FeatureState reqState = states.get(resource);