X-Git-Url: https://code.grnet.gr/git/pithos/blobdiff_plain/3f2e14a0d96ec6badeaa2c9bdc6f70d873d9153a..da7b63f23c05cf41822b0c6ffb1ed74a6ea7d6a3:/gss/src/gr/ebs/gss/server/rest/OthersHandler.java

diff --git a/gss/src/gr/ebs/gss/server/rest/OthersHandler.java b/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
index a936bc0..734b8f8 100644
--- a/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
+++ b/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
@@ -75,8 +75,12 @@ public class OthersHandler extends RequestHandler {
 	        	JSONArray json = new JSONArray();
 
     	    	List<UserDTO> others = getService().getUsersSharingFoldersForUser(owner.getId());
-		    	for (UserDTO u: others)
-		    		json.put(parentUrl + u.getUsername());
+		    	for (UserDTO u: others) {
+		    		JSONObject j = new JSONObject();
+		    		j.put("username", u.getUsername()).
+		    			put("uri", parentUrl + u.getUsername());
+		    		json.put(j);
+		    	}
 
             	sendJson(req, resp, json.toString());
     		} catch (ObjectNotFoundException e) {
@@ -87,6 +91,10 @@ public class OthersHandler extends RequestHandler {
     			logger.error("", e);
     			resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     			return;
+			} catch (JSONException e) {
+				logger.error("", e);
+				resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				return;
 			}
 		else
 			try {