394519 Better NPE checking
Conflicts:
org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
diff --git a/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
index 5a1f740..d89d6ea 100644
--- a/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
+++ b/org.eclipse.gemini.management/src/main/java/org/eclipse/gemini/management/framework/BundleWiringState.java
@@ -75,8 +75,11 @@
public CompositeData getCurrentWiring(long bundleId, String namespace) throws IOException {
namespace = processNamespace(namespace);
BundleWiring wiring = getBundle(bundleId).adapt(BundleWiring.class);
- OSGiBundleRevisionIdTracker revisionTracker = new OSGiBundleRevisionIdTracker();
- return new OSGiBundleWiring(wiring).asCompositeData(namespace, revisionTracker);
+ if(wiring != null){
+ return new OSGiBundleWiring(wiring).asCompositeData(namespace, revisionTracker);
+ }else{
+ return null;
+ }
}
/**
@@ -134,7 +137,10 @@
TabularDataSupport table = new TabularDataSupport(BundleWiringStateMBean.BUNDLES_WIRING_TYPE);
OSGiBundleRevisionIdTracker revisionTracker = new OSGiBundleRevisionIdTracker();
for (BundleRevision bundleRevision : bundleRevisions) {
- table.put(new OSGiBundleWiring(bundleRevision.getWiring()).asCompositeData(namespace, revisionTracker));
+ BundleWiring wiring = bundleRevision.getWiring();
+ if(wiring != null){
+ table.put(new OSGiBundleWiring(wiring).asCompositeData(namespace, revisionTracker));
+ }
}
return table;
}
@@ -182,11 +188,13 @@
* @param namespace
*/
private void processWiring(Map<BundleRevision, OSGiBundleWiring> mappings, BundleWiring wiring, String namespace){
- BundleRevision bundleRevision = wiring.getRevision();
- if(!mappings.containsKey(bundleRevision)) {
- mappings.put(bundleRevision, new OSGiBundleWiring(wiring));
- processRequiredWirings(mappings, wiring, namespace);
- processProvidedWirings(mappings, wiring, namespace);
+ if(wiring != null){
+ BundleRevision bundleRevision = wiring.getRevision();
+ if(!mappings.containsKey(bundleRevision)) {
+ mappings.put(bundleRevision, new OSGiBundleWiring(wiring));
+ processRequiredWirings(mappings, wiring, namespace);
+ processProvidedWirings(mappings, wiring, namespace);
+ }
}
}
