From 867d949988b59144965190a22b0e01f2807dfc5d Mon Sep 17 00:00:00 2001
From: Darin Wright
Date: Tue, 16 Nov 2004 21:36:22 +0000
Subject: Bug 78759  - NPE in WatchExpression.getLaunch

---
 .../core/org/eclipse/debug/internal/core/WatchExpression.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'org.eclipse.debug.core/core')

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
index e8d24628d..ddeb19501 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
@@ -183,7 +183,11 @@ public class WatchExpression implements IWatchExpression {
 	 * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
 	 */
 	public ILaunch getLaunch() {
-		return getDebugTarget().getLaunch();
+		IDebugTarget debugTarget = getDebugTarget();
+		if (debugTarget != null) {
+		    return debugTarget.getLaunch();
+		}
+		return null; 
 	}
 
 	/**
-- 
cgit v1.2.3