Tidied up interrupt check, added test case to make sure it works.

jhy · jhy · commit 032c97320f4c · 2016-10-29T22:41:48.000-07:00
diff --git a/CHANGES b/CHANGES
@@ -11,6 +11,10 @@ jsoup changelog
 
  * Added Node.root() to get the topmost ancestor of a Node.
 
+ * Allow the Jsoup.Connect thread to be interrupted when reading the input stream; helps when reading from a long stream
+   of data that doesn't read timeout.
+   <https://github.com/jhy/jsoup/pull/712>
+
  * In Jsoup.Connect, now detects if a header value is actually in UTF-8 vs the HTTP spec of ISO-8859, and converts
    the header value appropriately.
 
diff --git a/src/main/java/org/jsoup/helper/DataUtil.java b/src/main/java/org/jsoup/helper/DataUtil.java
@@ -139,7 +139,8 @@ static Document parseByteData(ByteBuffer byteData, String charsetName, String ba
     }
 
     /**
-     * Read the input stream into a byte buffer.
+     * Read the input stream into a byte buffer. To deal with slow input streams, you may interrupt the thread this
+     * method is executing on. The data read until being interrupted will be available.
      * @param inStream the input stream to read from
      * @param maxSize the maximum size in bytes to read from the stream. Set to 0 to be unlimited.
      * @return the filled byte buffer
@@ -153,7 +154,7 @@ public static ByteBuffer readToByteBuffer(InputStream inStream, int maxSize) thr
         int read;
         int remaining = maxSize;
 
-		while (!Thread.currentThread().isInterrupted()) {
+        while (!Thread.interrupted()) {
             read = inStream.read(buffer);
             if (read == -1) break;
             if (capped) {
@@ -165,11 +166,7 @@ public static ByteBuffer readToByteBuffer(InputStream inStream, int maxSize) thr
             }
             outStream.write(buffer, 0, read);
         }
-        
-		if (Thread.currentThread().isInterrupted()) {
-			Thread.interrupted();
-			throw new IOException("JSoup thread has been interrupted");
-		}
+
         return ByteBuffer.wrap(outStream.toByteArray());
     }
 
diff --git a/src/test/java/org/jsoup/integration/UrlConnectTest.java b/src/test/java/org/jsoup/integration/UrlConnectTest.java
@@ -771,4 +771,29 @@ public void inWildUtfRedirect2() throws IOException {
             doc.location()
         );
     }
+
+    @Test public void canInterruptRead() throws IOException, InterruptedException {
+        final String[] body = new String[1];
+        Thread runner = new Thread(new Runnable() {
+            public void run() {
+                try {
+                    Connection.Response res = Jsoup.connect("http://jsscxml.org/serverload.stream")
+                        .timeout(10 * 1000)
+                        .execute();
+                    body[0] = res.body();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+
+            }
+        });
+
+        runner.start();
+        Thread.sleep(1000 * 5);
+        runner.interrupt();
+        assertTrue(runner.isInterrupted());
+        runner.join();
+
+        assertTrue(body[0].length() > 0);
+    }
 }
