| commit | 217820f32f64d5fe9bfa4b443f36113b4ffae690 | [log] [tgz] |
|---|---|---|
| author | cbridgha <cbridgha> | Fri Jan 06 16:57:11 2006 +0000 |
| committer | cbridgha <cbridgha> | Fri Jan 06 16:57:11 2006 +0000 |
| tree | 4e02a8c9ce0a98a63c47f67777c7ffd38a72ef33 | |
| parent | f200d7045c94af30fe6c226cc779c6de54262b19 [diff] |
[122934] moving synch block to only loadResource portion of method
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 dfc616c..12f017e 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
@@ -86,14 +86,17 @@ /* (non-Javadoc) * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModel#getPrimaryRootObject() */ - public synchronized EObject getPrimaryRootObject() { + public EObject getPrimaryRootObject() { try { prepareProjectModulesIfNecessary(); } catch (CoreException e) { // TODO Auto-generated catch block e.printStackTrace(); } - EObject modelRoot = super.getPrimaryRootObject(); + EObject modelRoot = null; + synchronized (this) { + modelRoot = super.getPrimaryRootObject(); + } return modelRoot; }