Merge branch 'issue_3575' into develop

[pithos-web-client] / src / gr / grnet / pithos / web / client / rest / HeadRequest.java

diff --git a/src/gr/grnet/pithos/web/client/rest/HeadRequest.java b/src/gr/grnet/pithos/web/client/rest/HeadRequest.java
index b3602eb..0fafb03 100644 (file)
--- a/src/gr/grnet/pithos/web/client/rest/HeadRequest.java
+++ b/src/gr/grnet/pithos/web/client/rest/HeadRequest.java
@@ -35,6 +35,8 @@
 
 package gr.grnet.pithos.web.client.rest;
 
+import gr.grnet.pithos.web.client.Const;
+import gr.grnet.pithos.web.client.Helpers;
 import gr.grnet.pithos.web.client.Pithos;
 import gr.grnet.pithos.web.client.Resource;
 
@@ -93,16 +95,18 @@ public abstract class HeadRequest<T extends Resource> implements ScheduledComman
 
     @Override
     public void execute() {
-       if (path.contains("?"))
-               path += "&t=" + System.currentTimeMillis();
-       else
+       if (path.contains(Const.QUESTION_MARK)) {
+            path += "&t=" + System.currentTimeMillis();
+        }
+       else {
                path += "?t=" + System.currentTimeMillis();
-        Pithos.LOG("HEAD api = ", api, ", owner = ", owner, ", path = ", path);
-        Pithos.LOG("   ==> ", api + owner + path);
-        RequestBuilder builder = new RequestBuilder(RequestBuilder.HEAD, api + owner + path);
-        for (String header : headers.keySet()) {
-            builder.setHeader(header, headers.get(header));
         }
+
+        Pithos.LOG("HEAD ", api + owner + path);
+
+        RequestBuilder builder = new RequestBuilder(RequestBuilder.HEAD, api + owner + path);
+        Helpers.setHeaders(builder, headers);
+
         try {
             builder.sendRequest("", new RestRequestCallback<T>(api + owner + path, okCode) {
                 @Override