You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/09/22 10:09:03 UTC
[8/8] karaf git commit: [KARAF-4727] SCR bundle state should not
report SATISFIED components
[KARAF-4727] SCR bundle state should not report SATISFIED components
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/858920dd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/858920dd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/858920dd
Branch: refs/heads/master
Commit: 858920dd0a50af2d52003c3e75ac5063b027ddac
Parents: bff4449
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 22 12:08:34 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 22 12:08:34 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/scr/state/ScrBundleStateService.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/858920dd/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
----------------------------------------------------------------------
diff --git a/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java b/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
index 67cc045..03485a4 100644
--- a/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
+++ b/scr/state/src/main/java/org/apache/karaf/scr/state/ScrBundleStateService.java
@@ -42,7 +42,8 @@ public class ScrBundleStateService implements BundleStateService {
StringBuilder sb = new StringBuilder();
for (ComponentDescriptionDTO desc : scr.getComponentDescriptionDTOs(bundle)) {
for (ComponentConfigurationDTO cfg : scr.getComponentConfigurationDTOs(desc)) {
- if (cfg.state != ComponentConfigurationDTO.ACTIVE) {
+ if (cfg.state != ComponentConfigurationDTO.ACTIVE
+ && cfg.state != ComponentConfigurationDTO.SATISFIED) {
sb.append(cfg.description.name).append(" (").append(cfg.id).append(")\n");
if ((cfg.state & ComponentConfigurationDTO.UNSATISFIED_CONFIGURATION) != 0) {
sb.append(" missing configurations: ");
@@ -79,7 +80,8 @@ public class ScrBundleStateService implements BundleStateService {
if (bundle.getState() == Bundle.ACTIVE) {
for (ComponentDescriptionDTO desc : scr.getComponentDescriptionDTOs(bundle)) {
for (ComponentConfigurationDTO cfg : scr.getComponentConfigurationDTOs(desc)) {
- if (cfg.state != ComponentConfigurationDTO.ACTIVE) {
+ if (cfg.state != ComponentConfigurationDTO.ACTIVE
+ && cfg.state != ComponentConfigurationDTO.SATISFIED) {
return BundleState.Waiting;
}
}