diff options
author | Ed Merks | 2020-08-22 08:01:08 +0000 |
---|---|---|
committer | Ed Merks | 2020-08-22 08:01:40 +0000 |
commit | fb27b2600f70e48f7bcaa677ed278d832fb3c969 (patch) | |
tree | 2cffe3ed0699d8e92193c9bdb250bf06b4243808 | |
parent | 711c7b192fd965e827b25296b6cec3fa77a21c56 (diff) | |
download | org.eclipse.emf-fb27b2600f70e48f7bcaa677ed278d832fb3c969.tar.gz org.eclipse.emf-fb27b2600f70e48f7bcaa677ed278d832fb3c969.tar.xz org.eclipse.emf-fb27b2600f70e48f7bcaa677ed278d832fb3c969.zip |
Ensure that computed base URL doesn't end with // in general.
Signed-off-by: Ed Merks <ed.merks@gmail.com>
-rw-r--r-- | plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java index b434c7ed4..c137e34a2 100644 --- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java +++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java @@ -200,7 +200,8 @@ public abstract class DelegatingResourceLocator implements ResourceLocator { this.bundleLocalization = bundleLocalization; } - baseURL = new URL(uri.toString() + "/"); + String baseURI = uri.toString(); + baseURL = new URL(baseURI.endsWith("/") ? baseURI : baseURI + "/"); } catch (IOException exception) { |