Need to check if a revision has a wiring or not. (FELIX-3013)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1140307 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
index 471ec65..36026f0 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
@@ -506,10 +506,16 @@
// Create a list of the revision and any attached fragment revisions.
List<BundleRevision> result = new ArrayList<BundleRevision>();
result.add(br);
- List<BundleRevision> fragments = ((BundleWiringImpl) br.getWiring()).getFragments();
- if (fragments != null)
+ BundleWiring wiring = br.getWiring();
+ if (wiring != null)
{
- result.addAll(fragments);
+// TODO: OSGi R4.3 - Technically, I think we can get the fragments using standard
+// R4.3 API once we get everything implemented.
+ List<BundleRevision> fragments = ((BundleWiringImpl) wiring).getFragments();
+ if (fragments != null)
+ {
+ result.addAll(fragments);
+ }
}
return result;
}