[145166] better webcontext defalts
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
index f894773..5065f9a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
@@ -205,9 +205,7 @@
public Resource prepareProjectModulesIfNecessary() throws CoreException {
ModuleMigratorManager manager = ModuleMigratorManager.getManager(getProject());
XMIResource res;
- synchronized (ModulecorePlugin.getDefault()) {
- res = (XMIResource) getPrimaryResource();
- }
+ res = (XMIResource) getPrimaryResource();
if (resNeedsMigrating(res)) {
try {
if (!manager.isMigrating() && !ResourcesPlugin.getWorkspace().isTreeLocked()) {
@@ -271,13 +269,11 @@
Resource resource = getLocalResource(aUri);
if (null != resource) {
- synchronized (resource) {
- if (!resource.isLoaded()) {
- try {
- resource.load(Collections.EMPTY_MAP); // reload it
- } catch (IOException e) {
- // Ignore
- }
+ if (!resource.isLoaded()) {
+ try {
+ resource.load(Collections.EMPTY_MAP); // reload it
+ } catch (IOException e) {
+ // Ignore
}
}
}