[389489] Eliminate race condition for isFeatureMap.

16 files changed, 18 insertions, 16 deletions

diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index be3ea4c05..76bcc3de8 100644
--- a/features/org.eclipse.emf-feature/feature.xml
+++ b/features/org.eclipse.emf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.all-feature/feature.xml b/features/org.eclipse.emf.all-feature/feature.xml
index af87fc423..3ee54b9b0 100644
--- a/features/org.eclipse.emf.all-feature/feature.xml
+++ b/features/org.eclipse.emf.all-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.all"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.base-feature/feature.xml b/features/org.eclipse.emf.base-feature/feature.xml
index 41dbca731..7e1cf23b9 100644
--- a/features/org.eclipse.emf.base-feature/feature.xml
+++ b/features/org.eclipse.emf.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.base"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.ecore-feature/feature.xml b/features/org.eclipse.emf.ecore-feature/feature.xml
index 0cb973af0..2433a3018 100644
--- a/features/org.eclipse.emf.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecore"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt-feature/feature.xml b/features/org.eclipse.emf.gwt-feature/feature.xml
index 523de37c3..b15e023c4 100644
--- a/features/org.eclipse.emf.gwt-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
index d975688ab..9d3a82b75 100644
--- a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt.ecore"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
index 08fdec77a..307efab6e 100644
--- a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt.sdk"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.rap-feature/feature.xml b/features/org.eclipse.emf.rap-feature/feature.xml
index b197ab512..a3c600db4 100755
--- a/features/org.eclipse.emf.rap-feature/feature.xml
+++ b/features/org.eclipse.emf.rap-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.rap"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.rap.sdk-feature/feature.xml b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
index e1d4ab342..94d5d1c06 100755
--- a/features/org.eclipse.emf.rap.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.rap.sdk"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
index 7dddf9069..be0cd6f25 100644
--- a/features/org.eclipse.emf.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.sdk"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
index 9e88fa0ca..afe601503 100644
--- a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecore; singleton:=true
-Bundle-Version: 2.8.1.qualifier
+Bundle-Version: 2.8.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
index 4a86c121f..7494f8e69 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
@@ -3134,8 +3134,9 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
   {
     if (cachedEType != eType)
     {
-      cachedEType = getEType();
+      EClassifier eType = getEType();
       cachedIsFeatureMap = eType != null && eType.getInstanceClassName() == "org.eclipse.emf.ecore.util.FeatureMap$Entry";
+      cachedEType = eType;
     }
     return cachedIsFeatureMap;
   }
diff --git a/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
index 22a77cbec..549589b9c 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.gwt.ecore;singleton:=true
-Bundle-Version: 2.8.1.qualifier
+Bundle-Version: 2.8.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
index d2cef8efc..85dcb44ab 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
@@ -3148,8 +3148,9 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
   {
     if (cachedEType != eType)
     {
-      cachedEType = getEType();
+      EClassifier eType = getEType();
       cachedIsFeatureMap = eType != null && eType.getInstanceClassName() == "org.eclipse.emf.ecore.util.FeatureMap$Entry";
+      cachedEType = eType;
     }
     return cachedIsFeatureMap;
   }
diff --git a/releng/org.eclipse.emf.base.build-feature/feature.xml b/releng/org.eclipse.emf.base.build-feature/feature.xml
index 0d89abcee..2e192a74d 100644
--- a/releng/org.eclipse.emf.base.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.base.build-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.base.build"
       label="Eclipse Modeling Framework (EMF) Base Build Site"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"
diff --git a/releng/org.eclipse.emf.build-feature/feature.xml b/releng/org.eclipse.emf.build-feature/feature.xml
index 34b55d60b..ec1e9622b 100755
--- a/releng/org.eclipse.emf.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.build-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.build"
       label="Eclipse Modeling Framework (EMF) Build Site"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.license"