commit | fa7a21555b19c42143a726526c343cfe2cf457d0 | [log] [tgz] |
---|---|---|
author | canderson <canderson> | Wed Aug 08 03:45:26 2007 +0000 |
committer | canderson <canderson> | Wed Aug 08 03:45:26 2007 +0000 |
tree | ece95c4a687811053f33a13f18c6e9502e51e680 | |
parent | 4e242ce1ed7e51129996a8483b3e3cd54e6a65ac [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 daae2f7..38d4099 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; } } }