diff options
| author | Darin Wright | 2003-07-08 20:35:53 +0000 |
|---|---|---|
| committer | Darin Wright | 2003-07-08 20:35:53 +0000 |
| commit | c299ed221fd68c4af0d575b719c90c59a495f3ed (patch) | |
| tree | c637e5ebf5e75adb1ded9d8a38730faab7f0e608 | |
| parent | 20073afa8aeca206111c3c3a2c2509e7f07bbb10 (diff) | |
| download | eclipse.platform.debug-c299ed221fd68c4af0d575b719c90c59a495f3ed.tar.gz eclipse.platform.debug-c299ed221fd68c4af0d575b719c90c59a495f3ed.tar.xz eclipse.platform.debug-c299ed221fd68c4af0d575b719c90c59a495f3ed.zip | |
bug 39482 - NPE adding Java Watch expressions
2 files changed, 10 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewContentProvider.java index f53cbc615..b7af1a367 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionViewContentProvider.java @@ -57,7 +57,11 @@ public class ExpressionViewContentProvider extends VariablesViewContentProvider protected IVariable[] getModelSpecificExpressionChildren(IExpression parent) throws DebugException { IObjectBrowser contentProvider = getObjectBrowser(getDebugModelId(parent)); - return contentProvider.getChildren(getDebugView(), parent.getValue()); + IValue value = parent.getValue(); + if (value == null) { + return new IVariable[0]; + } + return contentProvider.getChildren(getDebugView(), value); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewContentProvider.java index 71b0cd3da..e4fdef0ea 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewContentProvider.java @@ -103,7 +103,11 @@ public class VariablesViewContentProvider implements ITreeContentProvider, protected IVariable[] getModelSpecificVariableChildren(IVariable parent) throws DebugException { IObjectBrowser objectBrowser = getObjectBrowser(getDebugModelId(parent)); - return objectBrowser.getChildren(getDebugView(), parent.getValue()); + IValue value = parent.getValue(); + if (value== null) { + return new IVariable[0]; + } + return objectBrowser.getChildren(getDebugView(), value); } /** |