Fixed logic around fallback resolver in URIResolverRegistry (#2101)

* Fixed logic around the fallback resolver returning null while resolving locations * Accounted for another edge case around the fallback resolver. Thanks @DavyLandman * Improved handling of an edge case around the fallback resolver. * Improved handling of an edge case around the fallback resolver.
usethesource · Dec 18, 2024 · cfc601c · cfc601c
1 parent 4871681
commit cfc601c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/org/rascalmpl/uri/URIResolverRegistry.java b/src/org/rascalmpl/uri/URIResolverRegistry.java
@@ -402,9 +402,10 @@ private ISourceLocation physicalLocation(ISourceLocation loc) throws IOException
 			ILogicalSourceLocationResolver resolver = map.get(auth);
 			loc = resolveAndFixOffsets(loc, resolver, map.values());
 		}
-		var fallBack = fallbackLogicalResolver;
-		if (fallBack != null) {
-			return resolveAndFixOffsets(loc == null ? original : loc, fallBack, Collections.emptyList());
+
+		if (fallbackLogicalResolver != null) {
+			var fallbackResult = resolveAndFixOffsets(loc == null ? original : loc, fallbackLogicalResolver, Collections.emptyList());
+			return fallbackResult == null ? loc : fallbackResult;
 		}
 		return loc;
 	}