You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2022/01/29 12:22:22 UTC

[jena] branch main updated: JENA-2262: Skip to the end of response streams

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new ab87590  JENA-2262: Skip to the end of response streams
     new 0166749  Merge pull request #1180 from afs/admin2
ab87590 is described below

commit ab87590a77c88385b6b3b6ac90abcc49d8d7b76c
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Jan 28 21:26:00 2022 +0000

    JENA-2262: Skip to the end of response streams
---
 jena-base/src/main/java/org/apache/jena/atlas/io/IO.java   |  4 ++--
 .../src/test/java/org/apache/jena/fuseki/TestAdmin.java    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
index df650d1..d810bd1 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
@@ -562,7 +562,8 @@ public class IO
             SKIP_BUFFER = new byte[SKIP_BUFFER_LEN];
         try {
             for(;;) {
-                // Skip does not guarantee to go to end of file.
+                // InputStream.skip does not guarantee to go to end of file.
+                // Actually read it to be sure.
                 long rLen = input.read(SKIP_BUFFER, 0, SKIP_BUFFER_LEN);
                 if (rLen < 0) // EOF
                     break;
@@ -587,5 +588,4 @@ public class IO
             }
         } catch (IOException ex) {}
     }
-
 }
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
index 3060ebd..d0866ca 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
@@ -111,7 +111,9 @@ public class TestAdmin extends AbstractFusekiWebappTest {
     // --- List all datasets
 
     @Test public void list_datasets_1() {
-        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+"$/"+opDatasets); ) { }
+        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+"$/"+opDatasets); ) {
+            IO.skipToEnd(in);
+        }
     }
 
     @Test public void list_datasets_2() {
@@ -682,16 +684,18 @@ public class TestAdmin extends AbstractFusekiWebappTest {
        return taskObj.hasKey("started") &&  ! taskObj.hasKey("finished");
    }
 
-    // Auxilary
-
     private static void askPing(String name) {
         if ( name.startsWith("/") )
             name = name.substring(1);
-        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+name+"/sparql?query=ASK%7B%7D") ) {}
+        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+name+"/sparql?query=ASK%7B%7D") ) {
+            IO.skipToEnd(in);
+        }
     }
 
     private static void adminPing(String name) {
-        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+"$/"+opDatasets+"/"+name) ) {}
+        try ( TypedInputStream in = httpGet(ServerCtl.urlRoot()+"$/"+opDatasets+"/"+name) ) {
+            IO.skipToEnd(in);
+        }
     }
 
     private static void checkExists(String name)  {