| commit | 89341ebf23cb29aff84bd5ea7f7d02f23c96bcfd | [log] [tgz] |
|---|---|---|
| author | david_williams <david_williams> | Sun Nov 08 07:13:27 2009 +0000 |
| committer | david_williams <david_williams> | Sun Nov 08 07:13:27 2009 +0000 |
| tree | e6dcd1db36b846b87db03dee2d5a8674a6c2c832 | |
| parent | f320059fa6d29a17e63c1b89302d59098ee5ae31 [diff] |
294369 EAR 5.0 Lib utility deployment 294490 EAR Libraries container miscomputing because of stale IJavaLite 293586 org.eclipse.wst.common.component file incorrectly marked as need to be written
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html index 095f1cc..a7d74f9 100644 --- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html +++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -26,6 +26,7 @@ <p>Bug <a href='https://bugs.eclipse.org/292518'>292518</a>. Fix deadlock introduced by bug 290701</p> <p>Bug <a href='https://bugs.eclipse.org/292694'>292694</a>. MessageCategory is broken in the validation framework</p> <p>Bug <a href='https://bugs.eclipse.org/294214'>294214</a>. ProjectResourceSet creation notification while holding lock</p> +<p>Bug <a href='https://bugs.eclipse.org/293586'>293586</a>. org.eclipse.wst.common.component file incorrectly marked as need to be written</p> </body> </html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties index eb9bbcb..27019d1 100644 --- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties +++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -40,6 +40,7 @@ Bug https://bugs.eclipse.org/292518 Fix deadlock introduced by bug 290701\n\ Bug https://bugs.eclipse.org/292694 MessageCategory is broken in the validation framework\n\ Bug https://bugs.eclipse.org/294214 ProjectResourceSet creation notification while holding lock\n\ +Bug https://bugs.eclipse.org/293586 org.eclipse.wst.common.component file incorrectly marked as need to be written\n\ \n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java index a1fb0ab..14d0eae 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
@@ -378,7 +378,7 @@ public void saveIfNecessary(IProgressMonitor aMonitor) { if (isReadOnly) throwAttemptedReadOnlyModification(); - else if (validateEdit().isOK()) { + else if (structuralModel.isDirty() && validateEdit().isOK()) { if (!structuralModel.isDisposed()) structuralModel.saveIfNecessary(aMonitor, this); }