fix NPE when editing imported platform and library (fix #230)

xatkit-bot-platform · May 22, 2019 · 29ca458 · 29ca458
1 parent 19616b3
commit 29ca458
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/...language.execution/src/edu/uoc/som/jarvis/language/execution/ExecutionLinkingService.java b/...language.execution/src/edu/uoc/som/jarvis/language/execution/ExecutionLinkingService.java
@@ -59,10 +59,12 @@ private List<EObject> getLinkedObjectsForExecutionModel(ExecutionModel context,
 				String eventProviderName = qualifiedName.getLocalName();
 				PlatformDefinition platformDefinition = ImportRegistry.getInstance()
 						.getImportedPlatform((ExecutionModel) context, platformName);
-				EventProviderDefinition eventProviderDefinition = platformDefinition
-						.getEventProviderDefinition(eventProviderName);
-				if (nonNull(eventProviderDefinition)) {
-					return Arrays.asList(eventProviderDefinition);
+				if(nonNull(platformDefinition)) {
+					EventProviderDefinition eventProviderDefinition = platformDefinition
+							.getEventProviderDefinition(eventProviderName);
+					if (nonNull(eventProviderDefinition)) {
+						return Arrays.asList(eventProviderDefinition);
+					}
 				}
 			}
 			return Collections.emptyList();
@@ -109,13 +111,15 @@ private List<EObject> getLinkedObjectsForActionInstance(ActionInstance context,
 				String actionName = qualifiedName.getLocalName();
 				PlatformDefinition platformDefinition = ImportRegistry.getInstance().getImportedPlatform(executionModel,
 						platformName);
-				/*
-				 * Get the first one here, if there are multiple ActionDefinitions with the same name it will be rebound
-				 * when setting its parameters.
-				 */
-				ActionDefinition actionDefinition = platformDefinition.getActions(actionName).get(0);
-				if (nonNull(actionDefinition)) {
-					return Arrays.asList(actionDefinition);
+				if(nonNull(platformDefinition)) {
+					/*
+					 * Get the first one here, if there are multiple ActionDefinitions with the same name it will be rebound
+					 * when setting its parameters.
+					 */
+					ActionDefinition actionDefinition = platformDefinition.getActions(actionName).get(0);
+					if (nonNull(actionDefinition)) {
+						return Arrays.asList(actionDefinition);
+					}
 				}
 			}
 			return Collections.emptyList();