From 9a90cf75bfd8d59548c929a580453936c9a18291 Mon Sep 17 00:00:00 2001
From: sefftinge <sefftinge>
Date: Mon, 7 Jul 2008 13:05:29 +0000
Subject: [PATCH] null checks added

---
 .../eclipse/xtext/resource/XtextResource.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java
index 0b6aff22f..16cc2be7a 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java
@@ -54,16 +54,20 @@ public class XtextResource extends ResourceImpl {
 		int length = change.length();
 		int documentGrowth = length - rootNode.getLength();
 		int originalLength = length - documentGrowth;
-		
-		// unloading is required to ensure that any EObjects hanging around (e.g. in the outline) get a proxied URI
+
+		// unloading is required to ensure that any EObjects hanging around
+		// (e.g. in the outline) get a proxied URI
 		// and thus still can be compared by their URI
 		unload();
-		
+
 		parseResult = parser.reparse(rootNode, offset, originalLength, change);
 		getContents().clear();
-		getContents().add(parseResult.getRootASTElement());
-		if (parseResult != null && parseResult.getRootNode() != rootNode) {
-			addNodeContentAdapter();
+		if (parseResult != null) {
+			if (parseResult.getRootASTElement() != null)
+				getContents().add(parseResult.getRootASTElement());
+			if (parseResult.getRootNode() != rootNode) {
+				addNodeContentAdapter();
+			}
 		}
 	}