Bug 308094 - Representing popups for context menus

NPE guard in the command service

1 files changed, 6 insertions, 3 deletions

diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java
index 077f4d253cf..62096484f4e 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java
@@ -11,8 +11,6 @@
 
 package org.eclipse.e4.core.commands.internal;
 
-import org.eclipse.e4.core.contexts.IEclipseContext;
-
 import java.util.Map;
 import javax.inject.Inject;
 import org.eclipse.core.commands.Category;
@@ -21,6 +19,7 @@ import org.eclipse.core.commands.CommandManager;
 import org.eclipse.core.commands.IParameter;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.e4.core.commands.ECommandService;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 
 /**
  *
@@ -50,7 +49,11 @@ public class CommandServiceImpl implements ECommandService {
 	 * java.util.Map)
 	 */
 	public ParameterizedCommand createCommand(String id, Map parameters) {
-		return ParameterizedCommand.generateCommand(getCommand(id), parameters);
+		Command command = getCommand(id);
+		if (command == null) {
+			return null;
+		}
+		return ParameterizedCommand.generateCommand(command, parameters);
 	}
 
 	/*