Fix NPE in AbstractMergedModelProvider.getLastModificationTimeOfDDFile()

fbricon · robstryker · commit 865964f2ad5f · 2013-05-28T21:10:51.000+08:00
- I wrote 100 % of the code
- I have the right to contribute the code to Eclipse
- I have updated the header

Signed-off-by: Fred Bricon &lt;fbricon@gmail.com&gt;
Signed-off-by: Rob Stryker &lt;rob@oxbeef.net&gt;
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
@@ -232,7 +232,7 @@ private boolean hasToReloadModel() {
 	}
 
 	private long getLastModificationTimeOfDDFile() {
-		if (ddProvider == null || ((EObject)ddProvider.getModelObject()).eResource() == null){
+		if (ddProvider == null || ddProvider.getModelObject() == null || ((EObject)ddProvider.getModelObject()).eResource() == null){
 			return -1;
 		}
 		return WorkbenchResourceHelper.getFile(((EObject)ddProvider.getModelObject()).eResource()).getLocalTimeStamp();

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private boolean hasToReloadModel() {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`private long getLastModificationTimeOfDDFile() {`
`235`		`- if (ddProvider == null \|\| ((EObject)ddProvider.getModelObject()).eResource() == null){`
	`235`	`+ if (ddProvider == null \|\| ddProvider.getModelObject() == null \|\| ((EObject)ddProvider.getModelObject()).eResource() == null){`
`236`	`236`	`return -1;`
`237`	`237`	`}`
`238`	`238`	`return WorkbenchResourceHelper.getFile(((EObject)ddProvider.getModelObject()).eResource()).getLocalTimeStamp();`