Revert previous change: Don't decode URI, as we only need it encoded anyway.

diff --git a/gss/src/gr/ebs/gss/client/rest/resource/FileResource.java b/gss/src/gr/ebs/gss/client/rest/resource/FileResource.java
index a19d1fe..0c2b569 100644 (file)
--- a/gss/src/gr/ebs/gss/client/rest/resource/FileResource.java
+++ b/gss/src/gr/ebs/gss/client/rest/resource/FileResource.java
@@ -423,8 +423,6 @@ public class FileResource extends RestResource {
                if (metadata.get("folder") != null) {
                        JSONObject folder = metadata.get("folder").isObject();
                        folderURI = unmarshallString(folder, "uri");
-                       if (folderURI!=null)
-                               folderURI = URL.decodeComponent(folderURI);
                        folderName = unmarshallString(folder, "name");
                        if(folderName != null)
                                folderName = URL.decodeComponent(folderName);

diff --git a/gss/src/gr/ebs/gss/client/rest/resource/TrashResource.java b/gss/src/gr/ebs/gss/client/rest/resource/TrashResource.java
index 6603687..67957f3 100644 (file)
--- a/gss/src/gr/ebs/gss/client/rest/resource/TrashResource.java
+++ b/gss/src/gr/ebs/gss/client/rest/resource/TrashResource.java
@@ -126,7 +126,6 @@ public class TrashResource extends RestResource{
                                        JSONObject so = subs.get(i).isObject();
                                        if (so != null) {
                                                String subUri = unmarshallString(so, "uri");
-                                               subUri = URL.decodeComponent(subUri);
                                                String subName = unmarshallString(so, "name");
                                                subName = URL.decodeComponent(subName);
                                                if (subUri != null && subName != null) {
@@ -161,7 +160,6 @@ public class TrashResource extends RestResource{
                                                if (fo.get("creationDate") != null)
                                                        fcreationDate = new Date(new Long(fo.get("creationDate").toString()));
                                                String furi = unmarshallString(fo,"uri");
-                                               furi = URL.decodeComponent(furi);
                                                Long fsize = 0L;
                                                if(fo.get("size") != null)
                                                        fsize = new Long(fo.get("size").toString());