From 90decd4c9fcd20ff3922b76a62240d4fbeda341b Mon Sep 17 00:00:00 2001
From: Michael Rennie
Date: Tue, 15 Jul 2008 20:55:22 +0000
Subject: Bug 240985 NPE adding org.eclipse.ui.console.consolePageParticipants
 extension without enablement clause

---
 .../ui/internal/console/ConsolePageParticipantExtension.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'org.eclipse.ui.console')

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
index c329cdb98..d9c5f5697 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
@@ -46,8 +46,12 @@ public class ConsolePageParticipantExtension implements IPluginContribution {
     
     public boolean isEnabledFor(IConsole console) throws CoreException {
         EvaluationContext context = new EvaluationContext(null, console);
-        EvaluationResult evaluationResult = getEnablementExpression().evaluate(context);
-        return evaluationResult == EvaluationResult.TRUE;
+        Expression expression = getEnablementExpression();
+        if (expression != null){
+        	EvaluationResult evaluationResult = expression.evaluate(context);
+            return evaluationResult == EvaluationResult.TRUE;	
+        }
+        return true;
     }
     
     public Expression getEnablementExpression() throws CoreException {
-- 
cgit v1.2.1