commit | ba199fc6760e3019c3d5b3a1b485234b548bc31b | [log] [tgz] |
---|---|---|
author | canderson <canderson> | Wed Aug 08 02:52:23 2007 +0000 |
committer | canderson <canderson> | Wed Aug 08 02:52:23 2007 +0000 |
tree | 1cb46714fb09725568aec035c00255458b8ae22c | |
parent | 09ee3b2c4231ff2b2abda0678f0c0b0e536bb917 [diff] |
[198744] NPE in EditModelRegistry
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java index 0733b32..dcfa367 100644 --- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java +++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java
@@ -304,7 +304,7 @@ return this.factory; } - private void initializeResources() { + private synchronized void initializeResources() { if (editModelResources == null) { if (configurationElement != null) { @@ -328,6 +328,7 @@ discardConfigurationElementIfNecessary(); } else { editModelResources = Collections.EMPTY_LIST; + editModelExtensions = Collections.EMPTY_LIST; } } }