commit fb27b2600f70e48f7bcaa677ed278d832fb3c969
author Ed Merks <ed.merks@gmail.com> Sat Aug 22 10:01:08 2020 +0200
committer Ed Merks <ed.merks@gmail.com> Sat Aug 22 10:01:40 2020 +0200
tree 2cffe3ed0699d8e92193c9bdb250bf06b4243808
parent 711c7b192fd965e827b25296b6cec3fa77a21c56

[566200] EMF gives wrong baseUrl in felix OSGi

Ensure that computed base URL doesn't end with // in general.

Signed-off-by: Ed Merks <ed.merks@gmail.com>

plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/DelegatingResourceLocator.java

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 b434c7e..c137e34 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 @@
                 {
                   this.bundleLocalization = bundleLocalization;
                 }
-                baseURL = new URL(uri.toString() + "/");
+                String baseURI = uri.toString();
+                baseURL = new URL(baseURI.endsWith("/") ? baseURI : baseURI + "/");
               }
               catch (IOException exception)
               {