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:28 UTC
[2/2] karaf git commit: Avoid NPE
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);