From d4ca84c98b75636e2844c7a571d71eab00c64b2b Mon Sep 17 00:00:00 2001 From: Mark McKay Date: Thu, 22 Jul 2021 13:11:46 -0400 Subject: [PATCH] Removing redundant slashes for URIs that are obtained from Class.getResource() --- svg-core/src/main/java/com/kitfox/svg/SVGUniverse.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/svg-core/src/main/java/com/kitfox/svg/SVGUniverse.java b/svg-core/src/main/java/com/kitfox/svg/SVGUniverse.java index 90933cc..e22410a 100644 --- a/svg-core/src/main/java/com/kitfox/svg/SVGUniverse.java +++ b/svg-core/src/main/java/com/kitfox/svg/SVGUniverse.java @@ -333,8 +333,16 @@ public SVGElement getElement(URI path, boolean loadIfAbsent) { try { + String schemeSpecific = path.getSchemeSpecificPart(); + if (schemeSpecific.startsWith("file:///")) + { + //Work around for URIs of resources obtained by Class.getResource() + schemeSpecific = "file:/" + schemeSpecific.substring(8); + } + + //Strip fragment from URI - URI xmlBase = new URI(path.getScheme(), path.getSchemeSpecificPart(), null); + URI xmlBase = new URI(path.getScheme(), schemeSpecific, null); SVGDiagram dia = (SVGDiagram) loadedDocs.get(xmlBase); if (dia == null && loadIfAbsent)