Fixed NPE.async_tree_viewer

1 files changed, 18 insertions, 15 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultUpdatePolicy.java
index 1204a3a27..f087d9d8d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultUpdatePolicy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/DefaultUpdatePolicy.java
@@ -66,21 +66,24 @@ public class DefaultUpdatePolicy extends AbstractUpdatePolicy implements IModelC
 
 	private void handleChange(IModelDeltaNode node) {
 		int flags = node.getFlags();
-		if ((flags & IModelDelta.STATE) != 0) {
-			getViewer().update(node.getElement());
-		}
-		if ((flags & IModelDelta.CONTENT) != 0) {
-			getViewer().refresh(node.getElement());
-		}
-		if ((flags & IModelDelta.SELECT) != 0) {
-			getViewer().update(node.getElement());
-			TreePath treePath = getTreePath(node);
-			((AsynchronousTreeViewer) getViewer()).setSelection(new TreeSelection(treePath));
-		}
-		if ((flags & IModelDelta.EXPAND) != 0) {
-			getViewer().update(node.getElement());
-			TreePath treePath = getTreePath(node);
-			((AsynchronousTreeViewer) getViewer()).expand(new TreeSelection(treePath));
+		AsynchronousViewer viewer = getViewer();
+		if (viewer != null) {
+			if ((flags & IModelDelta.STATE) != 0) {
+				viewer.update(node.getElement());
+			}
+			if ((flags & IModelDelta.CONTENT) != 0) {
+				viewer.refresh(node.getElement());
+			}
+			if ((flags & IModelDelta.SELECT) != 0) {
+				viewer.update(node.getElement());
+				TreePath treePath = getTreePath(node);
+				((AsynchronousTreeViewer) getViewer()).setSelection(new TreeSelection(treePath));
+			}
+			if ((flags & IModelDelta.EXPAND) != 0) {
+				viewer.update(node.getElement());
+				TreePath treePath = getTreePath(node);
+				((AsynchronousTreeViewer) getViewer()).expand(new TreeSelection(treePath));
+			}
 		}
 	}