commit dbefe3761a72f03d161bcc65f38ed976f1a54508
author Ed Merks <ed.merks@gmail.com> Wed Mar 25 05:47:10 2015 +0100
committer Ed Merks <ed.merks@gmail.com> Wed Mar 25 05:47:10 2015 +0100
tree 7363b6af04dbb5a4854f364d04e2ee1f12c1bccd
parent 2bf98b7d6fbb5b14e1ad0c8fab4ccf6f69ecc3e5

[461398] Improve/fix caching in EClass' eAllStructuralFeature list.

plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java

diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
index 9333e9d..00babf5 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EClassImpl.java
@@ -806,8 +806,8 @@
       {
         private static final long serialVersionUID = 1L;
 
-        protected EStructuralFeature [] containments;
-        protected EStructuralFeature [] crossReferences;
+        protected EStructuralFeature [] containments = NO_EALL_STRUCTURE_FEATURES_DATA;
+        protected EStructuralFeature [] crossReferences = NO_EALL_STRUCTURE_FEATURES_DATA;
 
         public EAllStructuralFeaturesList(BasicEList<EStructuralFeature> eAllStructuralFeatures)
         {
@@ -869,7 +869,7 @@
 
         public EStructuralFeature [] containments()
         {
-          if (containments == null)
+          if (containments == NO_EALL_STRUCTURE_FEATURES_DATA)
           {
             init();
           }
@@ -878,7 +878,7 @@
 
         public EStructuralFeature [] crossReferences()
         {
-          if (crossReferences == null)
+          if (crossReferences == NO_EALL_STRUCTURE_FEATURES_DATA)
           {
             init();
           }