You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2012/08/16 23:31:47 UTC
svn commit: r1374070 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
Author: sallen
Date: Thu Aug 16 21:31:47 2012
New Revision: 1374070
URL: http://svn.apache.org/viewvc?rev=1374070&view=rev
Log:
JENA-298 ResultSetStAX.hasNext() cannot be called again after it has returned false
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java?rev=1374070&r1=1374069&r2=1374070&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java Thu Aug 16 21:31:47 2012
@@ -224,9 +224,10 @@ class XMLInputStAX extends SPARQLResult
if ( ! isResultSet )
throw new ResultSetException("Not an XML result set") ;
+ if ( finished )
+ return false ;
+
try {
- if ( finished )
- return false ;
if ( binding == null )
binding = getOneSolution() ;
} catch (XMLStreamException ex)
@@ -237,6 +238,8 @@ class XMLInputStAX extends SPARQLResult
row++ ;
boolean b = (binding != null) ;
//parser.close() ; // Some way to close the input stream.
+ if (!b)
+ finished = true ;
return b ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java?rev=1374070&r1=1374069&r2=1374070&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java Thu Aug 16 21:31:47 2012
@@ -162,7 +162,6 @@ public class TestResultSet extends BaseT
test_RS_fmt(rs, ResultsFormat.FMT_RDF_XML, false) ;
}
- @org.junit.Ignore
@Test public void test_RS_10()
{
ResultSet rs = ResultSetFactory.load("testing/ResultSet/output.srx") ;