| commit | e380c0b1e60b0eede5c76e51eec72b40c2dba641 | [log] [tgz] |
|---|---|---|
| author | Marcel Offermans <marrs@apache.org> | Mon Oct 17 09:03:19 2011 +0000 |
| committer | Marcel Offermans <marrs@apache.org> | Mon Oct 17 09:03:19 2011 +0000 |
| tree | 2546164507a1779252e4fd4c144cdf9e87f6c18f | |
| parent | cfbac7a4638ae58d2706063b2a0d2b05cee32265 [diff] |
Bugfix for an IllegalStateException that occurred in the shell command because of propagated configuration items not being available. Added an explicit check. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1185044 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java index 3bd4040..23de8fd 100644 --- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java +++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java
@@ -863,7 +863,7 @@ addTo(properties, m_serviceProperties); for (int i = 0; i < m_dependencies.size(); i++) { Dependency d = (Dependency) m_dependencies.get(i); - if (d.isPropagated()) { + if (d.isPropagated() && d.isAvailable()) { Dictionary dict = d.getProperties(); addTo(properties, dict); }