svn commit: r1604330 - in /jena/trunk/jena-arq/src: main/java/com/hp/hpl/jena/sparql/engine/http/Service.java test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java

[andy]

Author: andy
Date: Sat Jun 21 10:00:58 2014
New Revision: 1604330

URL: http://svn.apache.org/r1604330
Log:
Clean code for warnings found by AutoCloseable on QueryIterator.

Modified:
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
    
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java?rev=1604330&r1=1604329&r2=1604330&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
 Sat Jun 21 10:00:58 2014
@@ -178,8 +178,7 @@ public class Service {
         // Fuseki+SERVICE <http://localhost:3030/...>
 
         ResultSet rs = ResultSetFactory.fromXML(in);
-        QueryIterator qIter = new QueryIteratorResultSet(rs);
-        qIter = QueryIter.materialize(qIter);
+        QueryIterator qIter = QueryIter.materialize(new 
QueryIteratorResultSet(rs));
         // And close connection now, not when qIter is closed.
         IO.close(in);
 

Modified: 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java?rev=1604330&r1=1604329&r2=1604330&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
 (original)
+++ 
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
 Sat Jun 21 10:00:58 2014
@@ -155,10 +155,9 @@ public class TestQueryIterSort {
         assertEquals(500, iterator.getReturnedElementCount()) ;
         assertEquals(49, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
         while (qIter.hasNext())
-        {
             qIter.next();
-        }
         assertEquals(0, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
+        qIter.close() ;
     }
     
     @Test(expected=QueryCancelledException.class)