Returning empty list of packages if uri is relative and resourse is null

Nasdanika · May 7, 2017 · 94ce113 · 94ce113
1 parent 9ef065f
commit 94ce113
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java b/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java
@@ -4,6 +4,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import org.eclipse.core.runtime.Plugin;
 import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
 import org.eclipse.emf.common.util.ECollections;
@@ -110,7 +111,12 @@ public EList<EPackage> getEPackages(ResourceSet resourceSet) {
 			}			
 		} else {
 			URI uri = URI.createURI(getLocation());
-			if (eResource() != null) { 
+			if (uri.isRelative()) {
+				if (eResource() == null) {
+					System.err.println("Resource is null"); // TODO - proper logging.
+					return ret;
+				}
+
 				URI base = eResource().getURI();
 				if (base != null && base.isHierarchical()) {
 					uri = uri.resolve(base);