[390828] Guard against GenPackages without an Ecore package

2 files changed, 13 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.xtend b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.xtend
index ff817f857..9cf307e70 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.xtend
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.xtend
@@ -142,7 +142,11 @@ class XcoreGenModelBuilder
     val List<EPackage> ePackages = new UniqueEList<EPackage>()
     for (genPackage : genModel.genPackages)
     {
-      ePackages.add(genPackage.getEcorePackage)
+      val ePackage = genPackage.getEcorePackage
+      if (ePackage != null)
+      {
+        ePackages.add(genPackage.getEcorePackage)
+      }
     }
 
     var int i = 0
diff --git a/plugins/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.java b/plugins/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.java
index 3934c60ca..994506af0 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenModelBuilder.java
@@ -227,8 +227,14 @@ public class XcoreGenModelBuilder {
     final List<EPackage> ePackages = _uniqueEList;
     EList<GenPackage> _genPackages = genModel.getGenPackages();
     for (final GenPackage genPackage : _genPackages) {
-      EPackage _ecorePackage = genPackage.getEcorePackage();
-      ePackages.add(_ecorePackage);
+      {
+        final EPackage ePackage = genPackage.getEcorePackage();
+        boolean _notEquals = (!Objects.equal(ePackage, null));
+        if (_notEquals) {
+          EPackage _ecorePackage = genPackage.getEcorePackage();
+          ePackages.add(_ecorePackage);
+        }
+      }
     }
     int i = 0;
     int _size = ePackages.size();