From 577c43d60cc345bc3ddfec293a17a8e42ae3ad3a Mon Sep 17 00:00:00 2001 From: Sven Efftinge Date: Mon, 11 Jan 2016 10:29:23 +0100 Subject: [PATCH] [485239] fixed NPE --- .../eclipse/xtext/resource/XtextPlatformResourceURIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java index eec10f0bf..781276bad 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextPlatformResourceURIHandler.java @@ -37,7 +37,7 @@ public class XtextPlatformResourceURIHandler extends URIHandlerImpl { @Override public URI resolve(URI uri) { - if (resolve && uri.isRelative() && uri.hasRelativePath() && !resourceSet.getPackageRegistry().containsKey(uri.trimFragment().toString())) { + if (resolve && baseURI != null && uri.isRelative() && uri.hasRelativePath() && !resourceSet.getPackageRegistry().containsKey(uri.trimFragment().toString())) { URI result = uri.resolve(baseURI); if (baseURI.isPlatform()) { if (result.isPlatform() && !(result.isPlatformPlugin() || result.isPlatformResource())) {