[474377] The cached field CDOResourceImpl.uri needs to be recomputed after moves

https://bugs.eclipse.org/bugs/show_bug.cgi?id=474377

1 files changed, 6 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java
index a64853cf85..c2a6278e5b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.view.ManagedContainerViewProvider;
 
 import org.eclipse.emf.internal.cdo.session.CDOSessionFactory;
 
+import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.container.IPluginContainer;
 
@@ -73,15 +74,16 @@ public class PluginContainerViewProvider extends ManagedContainerViewProvider
   @Override
   public URI getResourceURI(CDOView view, String path)
   {
-    if (path == null)
+    if (StringUtil.isEmpty(path))
     {
       path = "";
     }
+    else if (!path.startsWith("/"))
+    {
+      path = "/" + path;
+    }
 
     String authority = view.getSession().getRepositoryInfo().getUUID();
-    // String[] segments = StringUtil.isEmpty(path) ? null : new Path(path).segments();
-    // return URI.createHierarchicalURI(CDOURIUtil.PROTOCOL_NAME, authority, null, segments, null, null);
-
     return URI.createURI(CDOURIUtil.PROTOCOL_NAME + "://" + authority + path);
   }