239309 Deadlock
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 da90fa5..6415a6c 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
@@ -13,11 +13,12 @@
<h2>org.eclipse.wst.common_core.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=203155'>203155</a>. ISynchronizerExtenders not invoked if ResourceDelta contains changes from >1 project</p>
+<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=203155'>203155</a>. ISynchronizerExtenders not invoked if ResourceDelta contains changes from more than 1 project</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463'>206463</a>. Threading issues with WebServicesNode Job</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=211115'>211115</a>. J2EE FlexProjDeployable getURI(IModule module) returns an incorrect URI</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=209562'>209562</a>. J2EE DependencyGraphManager.metadataChanged() causing long delays</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538'>215538</a>. Several problems with J2EE and Web Dependencies properties pages</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=229110'>229110</a>. ComponentUtilities.findFile() may cause ClassCastException</p>
<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=229478'>229478</a>. ComponentSaveStrategyImpl needs to respect deploy paths</p>
+<p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=239309">239309</a>. Deadlock</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 91e9932..2c58ec1 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -37,6 +37,7 @@
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538 Several problems with J2EE and Web Dependencies properties pages\n\
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229110 ComponentUtilities.findFile() may cause ClassCastException\n\
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229478 ComponentSaveStrategyImpl needs to respect deploy paths\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=239309 Deadlock\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
index f3be5c9..ced1791 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.emfworkbench.integration; singleton:=true
-Bundle-Version: 1.1.6.qualifier
+Bundle-Version: 1.1.7.qualifier
Bundle-Activator: org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin
Bundle-Vendor: %pluginVendor
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
index f0c22ea..d9a126b 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
@@ -75,8 +75,8 @@
}
}
if (shouldAccess) {
+ editModel.access(this);
synchronized (lru) {
- editModel.access(this);
lru.add(editModel);
}
}
@@ -88,6 +88,7 @@
*/
public void optimizeLRUSizeIfNecessary() {
EditModel model = null;
+
synchronized (lru) {
if (lru.size() > threshhold) {
// remove oldest element and release the edit model.
@@ -97,9 +98,9 @@
lru.remove(model);
}
}
+ }
if (model != null)
model.releaseAccess(this);
- }
}
/**
