Merge pull request #476 from pyocd/bugfix/cmsis_variant_npe

Fix NPE in CProjectAttributes.getCmsisDeviceVariantName()
eclipse-embed-cdt · Jan 8, 2021 · e963b97 · e963b97
2 parents 5162151 + 6db3b26
commit e963b97
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...bug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/data/CProjectAttributes.java b/...bug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/data/CProjectAttributes.java
@@ -65,7 +65,7 @@ public static String getCmsisAttribute(ILaunchConfiguration configuration, Strin
 	public static String getCmsisDeviceVariantName(ILaunchConfiguration configuration) {
 
 		String variantName = getCmsisAttribute(configuration, CProjectPacksStorage.CMSIS_DEVICE_VARIANT_NAME);
-		if (!variantName.isEmpty()) {
+		if (variantName != null && !variantName.isEmpty()) {
 			return variantName;
 		}