Author: andy
Date: Wed Jun 25 09:12:31 2014
New Revision: 1605297
URL: http://svn.apache.org/r1605297
Log:
try-resources cleanup
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestQuery.java
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1605297&r1=1605296&r2=1605297&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
Wed Jun 25 09:12:31 2014
@@ -175,10 +175,9 @@ public class FusekiLib {
QuerySolutionMap initValues = null ;
if ( varName != null )
initValues = querySolution(varName, value) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, m,
initValues) ;
- ResultSet rs = ResultSetFactory.copyResults(qExec.execSelect()) ;
- qExec.close() ;
- return rs ;
+ try ( QueryExecution qExec = QueryExecutionFactory.create(query, m,
initValues) ) {
+ return ResultSetFactory.copyResults(qExec.execSelect()) ;
+ }
}
public static ResultSet query(String string, Dataset ds, String varName,
RDFNode value) {
@@ -186,10 +185,9 @@ public class FusekiLib {
QuerySolutionMap initValues = null ;
if ( varName != null )
initValues = querySolution(varName, value) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, ds,
initValues) ;
- ResultSet rs = ResultSetFactory.copyResults(qExec.execSelect()) ;
- qExec.close() ;
- return rs ;
+ try ( QueryExecution qExec = QueryExecutionFactory.create(query, ds,
initValues) ) {
+ return ResultSetFactory.copyResults(qExec.execSelect()) ;
+ }
}
private static QuerySolutionMap querySolution(String varName, RDFNode
value) {
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1605297&r1=1605296&r2=1605297&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Wed Jun 25 09:12:31 2014
@@ -232,15 +232,14 @@ public abstract class SPARQL_Query exten
}
// Assumes finished whole thing by end of sendResult.
- action.beginRead() ;
- QueryExecution qExec = null ;
try {
+ action.beginRead() ;
Dataset dataset = decideDataset(action, query, queryStringLog) ;
- qExec = createQueryExecution(query, dataset) ;
- SPARQLResult result = executeQuery(action, qExec, query,
queryStringLog) ;
-
- // Deals with exceptions itself.
- sendResults(action, result, query.getPrologue()) ;
+ try ( QueryExecution qExec = createQueryExecution(query, dataset)
; ) {
+ SPARQLResult result = executeQuery(action, qExec, query,
queryStringLog) ;
+ // Deals with exceptions itself.
+ sendResults(action, result, query.getPrologue()) ;
+ }
} catch (QueryCancelledException ex) {
// Additional counter information.
incCounter(action.getEndpoint().getCounters(), QueryTimeouts) ;
@@ -249,11 +248,7 @@ public abstract class SPARQL_Query exten
// Additional counter information.
incCounter(action.getEndpoint().getCounters(), QueryExecErrors) ;
throw ex ;
- } finally {
- if ( qExec != null )
- qExec.close() ;
- action.endRead() ;
- }
+ } finally { action.endRead() ; }
}
/**
Modified:
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1605297&r1=1605296&r2=1605297&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestQuery.java
(original)
+++
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestQuery.java
Wed Jun 25 09:12:31 2014
@@ -70,25 +70,23 @@ public class TestQuery extends BaseTest
@Test public void query_recursive_01()
{
String query = "SELECT * WHERE { SERVICE <" + serviceQuery + "> { ?s
?p ?o . BIND(?o AS ?x) } }";
- QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery, query);
- ResultSet rs = qExec.execSelect();
-
- Var x = Var.alloc("x");
- while (rs.hasNext()) {
- Binding b = rs.nextBinding();
- Assert.assertNotNull(b.get(x));
+ try ( QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+ ResultSet rs = qExec.execSelect();
+ Var x = Var.alloc("x");
+ while (rs.hasNext()) {
+ Binding b = rs.nextBinding();
+ Assert.assertNotNull(b.get(x));
+ }
}
- qExec.close();
}
@Test public void query_with_params_01()
{
String query = "ASK { }";
- QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery + "?output=json", query);
-
- boolean result = qExec.execAsk();
- Assert.assertTrue(result);
- qExec.close();
+ try ( QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery + "?output=json", query) ) {
+ boolean result = qExec.execAsk();
+ Assert.assertTrue(result);
+ }
}
@Test public void request_id_header_01() throws IOException
