summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2013-05-21 08:18:26 (EDT)
committer Rob Stryker2013-05-28 09:10:51 (EDT)
commit865964f2ad5fdf209074cbe8b0db2dce91be19ce (patch)
treecf988695596135b3f73dbcaca8f29ee27e05bf8d
parent77293b75e3d5cda6aedda127c214370d113fc5a5 (diff)
downloadwebtools.javaee-865964f2ad5fdf209074cbe8b0db2dce91be19ce.zip
webtools.javaee-865964f2ad5fdf209074cbe8b0db2dce91be19ce.tar.gz
webtools.javaee-865964f2ad5fdf209074cbe8b0db2dce91be19ce.tar.bz2
Fix NPE in AbstractMergedModelProvider.getLastModificationTimeOfDDFile()
- 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 <fbricon@gmail.com> Signed-off-by: Rob Stryker <rob@oxbeef.net>
-rw-r--r--plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java2
1 files changed, 1 insertions, 1 deletions
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
index c3328ec..b79a6dc 100644
--- 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 @@ public abstract class AbstractMergedModelProvider<T> implements IModelProvider {
}
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();