Bug 387247 - NPE in MakeHandlersGo#isEnabled()
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/MakeHandlersGo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/MakeHandlersGo.java
index af44845..51da911 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/MakeHandlersGo.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/MakeHandlersGo.java
@@ -134,10 +134,10 @@
public boolean isEnabled() {
EHandlerService hs = (EHandlerService) workbench.getService(EHandlerService.class);
ECommandService cs = (ECommandService) workbench.getService(ECommandService.class);
- Command command = cs.getCommand(commandId);
- if (hs == null) {
+ if (hs == null || cs == null) {
return false;
}
+ Command command = cs.getCommand(commandId);
setBaseEnabled(hs.canExecute(new ParameterizedCommand(command, null)));
return super.isEnabled();
}
