Fixed rate handling limit handling

kohsuke · kohsuke · commit 83ffe75baaf2 · 2015-12-02T12:03:39.000+01:00
Issue hub4j#220. If RateLimitHandler returns normally, it should retry.
diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java
@@ -501,6 +501,7 @@ private InputStream wrapStream(InputStream in) throws IOException {
 
         if ("0".equals(uc.getHeaderField("X-RateLimit-Remaining"))) {
             root.rateLimitHandler.onError(e,uc);
+            return;
         }
 
         InputStream es = wrapStream(uc.getErrorStream());
diff --git a/src/test/java/Foo.java b/src/test/java/Foo.java
@@ -1,4 +1,5 @@
 import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 
 import java.util.Collection;
@@ -14,4 +15,11 @@ public static void main(String[] args) throws Exception {
         }
         System.out.println(lst.size());
     }
+
+    private static void testRateLimit() throws Exception {
+        GitHub g = GitHub.connectAnonymously();
+        for (GHUser u : g.getOrganization("jenkinsci").listMembers()) {
+            u.getFollowersCount();
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,7 @@ private InputStream wrapStream(InputStream in) throws IOException {`
`501`	`501`
`502`	`502`	`if ("0".equals(uc.getHeaderField("X-RateLimit-Remaining"))) {`
`503`	`503`	`root.rateLimitHandler.onError(e,uc);`
	`504`	`+ return;`
`504`	`505`	`}`
`505`	`506`
`506`	`507`	`InputStream es = wrapStream(uc.getErrorStream());`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import org.kohsuke.github.GHRepository;`
	`2`	`+import org.kohsuke.github.GHUser;`
`2`	`3`	`import org.kohsuke.github.GitHub;`
`3`	`4`
`4`	`5`	`import java.util.Collection;`
`@@ -14,4 +15,11 @@ public static void main(String[] args) throws Exception {`
`14`	`15`	`}`
`15`	`16`	`System.out.println(lst.size());`
`16`	`17`	`}`
	`18`	`+`
	`19`	`+ private static void testRateLimit() throws Exception {`
	`20`	`+ GitHub g = GitHub.connectAnonymously();`
	`21`	`+ for (GHUser u : g.getOrganization("jenkinsci").listMembers()) {`
	`22`	`+ u.getFollowersCount();`
	`23`	`+ }`
	`24`	`+ }`
`17`	`25`	`}`