[Bug 414162] Model changes during validation trigger errors
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
index 4ea31fe..4630c68 100644
--- a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true
-Bundle-Version: 1.1.602.qualifier
+Bundle-Version: 1.1.603.qualifier
Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
index 9265639..31ea9c0 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
@@ -98,6 +98,10 @@
ElementInfo info = new ElementInfo();
info.target = (IDOMElement) node;
+ if (info.target.getModel().isModelStateChanging()) {
+ return;
+ }
+
// gather information to validate from target at once.
getInfo(info);
diff --git a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html
index 1937c84..2e98604 100644
--- a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html
+++ b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html
@@ -4,18 +4,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.2.5 Patches</title>
+<title>WTP 3.4.2 Patches</title>
</head>
<body>
-<h1>WTP 3.2.5 Patches</h1>
+<h1>WTP 3.4.2 Patches</h1>
<h2>org.eclipse.wst.web_core.feature</h2>
<h3>org.eclipse.wst.html.core</h3>
-<p>Bug <a href="https://bugs.eclipse.org/367856">367856</a>. [validation] Track javascript dependencies for validation in HTML</p>
-<p>Bug <a href="https://bugs.eclipse.org/368737">368737</a>. Allow adopters to add @Remote and @Local annotations to EJB class when creating a session EJB</p>
-<p>Bug <a href="https://bugs.eclipse.org/368749">368749</a>. Allow to change the default package for interfaces when creating new session EJBs</p>
-<p>Bug <a href="https://bugs.eclipse.org/371019">371019</a>. Incorrect validation of resource across web projects</p>
+<p>Bug <a href="https://bugs.eclipse.org/414162">414162</a>. Model changes during validation trigger errors</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.properties b/features/org.eclipse.wst.web_core.feature.patch/feature.properties
index db6eb80..9909ef6 100644
--- a/features/org.eclipse.wst.web_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.web_core.feature.patch/feature.properties
@@ -27,10 +27,7 @@
description=\
The bugs and fixes are described in the following bugzilla entries:\n\
\n\
-Bug https://bugs.eclipse.org/367856 [validation] Track javascript dependencies for validation in HTML\n\
-Bug https://bugs.eclipse.org/368737 Allow adopters to add @Remote and @Local annotations to EJB class when creating a session EJB\n\
-Bug https://bugs.eclipse.org/368749 Allow to change the default package for interfaces when creating new session EJBs\n\
-Bug https://bugs.eclipse.org/371019 Incorrect validation of resource across web projects\n\
+Bug https://bugs.eclipse.org/414162 Model changes during validation trigger errors\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.xml b/features/org.eclipse.wst.web_core.feature.patch/feature.xml
index 356c220..3b9d8d7 100644
--- a/features/org.eclipse.wst.web_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.web_core.feature.patch"
label="%featureName"
- version="3.2.5.qualifier"
+ version="3.4.2.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.wst.web_core.feature" version="3.2.5.v201106202200-7E7AFIFAJtn6XO92wNRGibSR_jHDTn" patch="true"/>
+ <import feature="org.eclipse.wst.web_core.feature" version="3.4.2.v201211061806-7E7HFUOAJz-nBU7m2-JSGuES3ZrGS2jq" patch="true"/>
</requires>
<plugin
@@ -27,11 +27,5 @@
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.wst.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
</feature>
