Changeset 1141 for OAIHarvester

Timestamp:

02/22/11 15:29:58 (13 years ago)

Author:

oschonef

Message:

• parse Retry-After header according to RFC 2616

File:

• OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/HarvestWorker.java (modified) (2 diffs)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/HarvestWorker.java

@@ -14 +14 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.cookie.DateParseException;
+import org.apache.http.impl.cookie.DateUtils;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.CoreProtocolPNames;
@@ -425 +427 @@
 
     private long parseTryAfter(HttpResponse response) {
+        long delay = -1;
         final Header s = response.getFirstHeader("Retry-After");
         if (s != null) {
             final String v = s.getValue();
             try {
-                return Long.parseLong(v);
+                delay = Long.parseLong(v);
             } catch (NumberFormatException e) {
-                /* IGNORE */
-            }
-        }
-        return 1000;
+                try {
+                    Date date = DateUtils.parseDate(v);
+                    delay = date.getTime() - System.currentTimeMillis();
+                } catch (DateParseException f) {
+                    /* IGNORE */
+                }
+            }
+        }
+        return (delay > 0) ? delay : 0;
     }