[299820] [validation] NPE in DelegatingSourceValidator#validate
diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 15a410a..a2b2453 100644
--- a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
-Bundle-Version: 1.0.442.qualifier
+Bundle-Version: 1.0.443.qualifier
Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java
index 3973bab..0859dbe 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java
@@ -201,7 +201,13 @@
if (delta.length > 0) {
// get the file, model and document:
IFile file = getFile(delta[0]);
- IDOMModel xmlModel = getModelForResource(file);
+ IDOMModel xmlModel = null;
+ if (file != null)
+ xmlModel = getModelForResource(file);
+ // some problem occurred, abort
+ if (xmlModel == null)
+ return;
+
try {
IDOMDocument document = xmlModel.getDocument();
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html b/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
index c64e633..fb31de4 100644
--- a/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
+++ b/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
@@ -18,6 +18,7 @@
<p>Bug <a href="https://bugs.eclipse.org/289464">289464</a>. IExecutionDelegate should be using ISafeRunnable</p>
<p>Bug <a href='https://bugs.eclipse.org/290322'>290322</a>. [reconciling] DirtyRegionProcessor cancels and schedules a Job for every keystroke</p>
<p>Bug <a href='https://bugs.eclipse.org/292088'>292088</a>. DirtyRegionProcessor Job may not be canceled when the editor closes</p>
+<p>Bug <a href='https://bugs.eclipse.org/299820'>299820</a>. [validation] NPE in DelegatingSourceValidator#validate</p>
</body>
</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties b/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
index 1ca8e76..feed38c 100644
--- a/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
@@ -32,6 +32,7 @@
Bug https://bugs.eclipse.org/289464 IExecutionDelegate should be using ISafeRunnable\n\
Bug https://bugs.eclipse.org/290322 [reconciling] DirtyRegionProcessor cancels and schedules a Job for every keystroke\n\
Bug https://bugs.eclipse.org/292088 DirtyRegionProcessor Job may not be canceled when the editor closes\n\
+Bug https://bugs.eclipse.org/299820 [validation] NPE in DelegatingSourceValidator#validate\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
