Bug 398685 - default file client createFolder() result often has wrong

Name value --Signed-off-by: Elijah El-Haddad <elijahe@ca.ibm.com>
elijahe · Jan 22, 2014 · 0c7c5af · 0c7c5af
1 parent dad7608
commit 0c7c5af
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/...lets/src/org/eclipse/orion/internal/server/servlets/workspace/ProjectParentDecorator.java b/...lets/src/org/eclipse/orion/internal/server/servlets/workspace/ProjectParentDecorator.java
@@ -41,9 +41,18 @@ public void addAtributesFor(HttpServletRequest request, URI resource, JSONObject
 		try {
 			URI base = new URI(resource.getScheme(), resource.getUserInfo(), resource.getHost(), resource.getPort(), request.getServletPath() + "/", null, null);
 			IPath basePath = new Path(base.getPath());
-			IPath resourcePath = new Path(resource.getPath());
-			if (resourcePath.hasTrailingSeparator() && !representation.getBoolean(ProtocolConstants.KEY_DIRECTORY)) {
-				resourcePath = resourcePath.append(representation.getString(ProtocolConstants.KEY_NAME));
+			IPath resourcePath = null;
+			try {
+				String locationString = representation.getString(ProtocolConstants.KEY_LOCATION);
+				URI location = new URI(locationString);
+				resourcePath = new Path(location.getPath());
+			} catch (JSONException je) {
+				// no String value found for ProtocolConstants.KEY_LOCATION,
+				// use resource path instead
+				resourcePath = new Path(resource.getPath());
+				if (resourcePath.hasTrailingSeparator() && !representation.getBoolean(ProtocolConstants.KEY_DIRECTORY)) {
+					resourcePath = resourcePath.append(representation.getString(ProtocolConstants.KEY_NAME));
+				}
 			}
 			IPath path = resourcePath.makeRelativeTo(basePath);
 			//nothing to do if request is not a folder or file