Bug 218240 - [expressions] Missing check for delegate and factory when creating watch expression

1 files changed, 7 insertions, 8 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
index c8b2911b4..6f300f4e3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionFactoryTester.java
@@ -36,20 +36,19 @@ public class WatchExpressionFactoryTester extends PropertyTester {
 		if (CAN_CREATE_WATCH_EXPRESSION_PROPERTY.equals(property)){
 	        if (element instanceof IVariable) {
 	            IVariable variable = (IVariable)element;
-	            DebugPlugin.getDefault().getExpressionManager().hasWatchExpressionDelegate(variable.getModelIdentifier());
-	            
-	            IWatchExpressionFactoryAdapter factory = WatchHandler.getFactory(variable);
-	            if (factory instanceof IWatchExpressionFactoryAdapterExtension) {
-	                IWatchExpressionFactoryAdapterExtension ext = (IWatchExpressionFactoryAdapterExtension) factory;
-	                return ext.canCreateWatchExpression(variable);
+	            if (DebugPlugin.getDefault().getExpressionManager().hasWatchExpressionDelegate(variable.getModelIdentifier())) {
+		            IWatchExpressionFactoryAdapter factory = WatchHandler.getFactory(variable);
+		            if (factory instanceof IWatchExpressionFactoryAdapterExtension) {
+		                IWatchExpressionFactoryAdapterExtension ext = (IWatchExpressionFactoryAdapterExtension) factory;
+		                return ext.canCreateWatchExpression(variable);
+		            }
+		            return true;
 	            }
-	            return true;
 	        } else {
 	            IWatchExpressionFactoryAdapter2 factory2 = WatchHandler.getFactory2(element);
 	            if (factory2 != null) {
 	                return factory2.canCreateWatchExpression(element);
 	            }
-	            return false;
 	        }
 		} 
 		return false;