[206176] Improper assertion failure in XMLCatalogIdResolver when running unit test
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
index 7dd6a00..61852f9 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLCatalogIdResolver.java
@@ -15,7 +15,6 @@
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.sse.core.internal.util.Assert;
import org.eclipse.wst.sse.core.internal.util.URIResolver;
import org.eclipse.wst.xml.core.internal.Logger;
@@ -77,8 +76,18 @@
// passing it thru to URIResolver
// bug 117424, we should be able to assume that the base location
// is non-null
- Assert.isNotNull(base, "Base location is expected to be non null."); //$NON-NLS-1$
- base = URIHelper.addImpliedFileProtocol(base);
+
+ /**
+ * We shouldn't assert a failure because the catalog does not
+ * require a base location to operate and it will be called from
+ * non-file-based scenarios.
+ *
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=206176
+ */
+ // Assert.isNotNull(base, "Base location is expected to be non null."); //$NON-NLS-1$
+ if (base != null) {
+ base = URIHelper.addImpliedFileProtocol(base);
+ }
}
result = URIResolverPlugin.createResolver().resolve(base, publicId, systemId);
return result;
