TCI - Fixed possible NPE in JUnit Tests
Change-Id: Ife669b749d743adbd7d53eb1c4fd37e55c01a4e9
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/SWTDataElementIdHelper.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/SWTDataElementIdHelper.java
index fe175f4..eb9e3ff 100644
--- a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/SWTDataElementIdHelper.java
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/SWTDataElementIdHelper.java
@@ -18,6 +18,7 @@
import org.eclipse.emf.ecp.view.spi.model.VElement;
import org.eclipse.emfforms.spi.swt.core.data.EMFFormsSWTDataService;
import org.eclipse.swt.widgets.Widget;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
@@ -69,7 +70,11 @@
}
private static String getId(VElement element, ViewModelContext context) {
- final BundleContext bundleContext = FrameworkUtil.getBundle(SWTDataElementIdHelper.class).getBundleContext();
+ final Bundle bundle = FrameworkUtil.getBundle(SWTDataElementIdHelper.class);
+ if (bundle == null) {
+ return element.getUuid();
+ }
+ final BundleContext bundleContext = bundle.getBundleContext();
if (bundleContext == null) {
return element.getUuid();
}
