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/06/22 08:03:44 UTC

[jena] branch main updated: gh-1393 fix for QueryExecutionAdapter.adapt returning null

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 f09e37bd23 gh-1393 fix for QueryExecutionAdapter.adapt returning null
     new 63a8f50b84 Merge pull request #1394 from Aklakan/gh-1393
f09e37bd23 is described below

commit f09e37bd23e6f3428a2025a0c8576775eae25b84
Author: Claus Stadler <Ra...@googlemail.com>
AuthorDate: Wed Jun 22 09:07:45 2022 +0200

    gh-1393 fix for QueryExecutionAdapter.adapt returning null
---
 .../org/apache/jena/sparql/exec/QueryExecutionCompat.java  |  5 ++++-
 .../org/apache/jena/sparql/exec/TestExecEnvironment.java   | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecutionCompat.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecutionCompat.java
index 8b6b904bf2..ef7f4ef284 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecutionCompat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecutionCompat.java
@@ -55,7 +55,10 @@ public class QueryExecutionCompat extends QueryExecutionAdapter {
     }
 
     @Override
-    protected QueryExec get() { return qExecHere; }
+    protected QueryExec get() {
+        execution();
+        return qExecHere;
+    }
 
     private void execution() {
         // Delay until used so setTimeout,setInitialBindings work.
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/exec/TestExecEnvironment.java b/jena-arq/src/test/java/org/apache/jena/sparql/exec/TestExecEnvironment.java
index 3e06254886..bf53b4f999 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/exec/TestExecEnvironment.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/exec/TestExecEnvironment.java
@@ -18,6 +18,10 @@
 
 package org.apache.jena.sparql.exec;
 
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestExecEnvironment {
@@ -29,4 +33,14 @@ public class TestExecEnvironment {
     // RegisterHttpClkient
 
     // RegistryRequestModifier
+
+
+    // https://github.com/apache/jena/issues/1393
+    @Test
+    public void testQueryExecAdapter() {
+        try (QueryExecution qExec = QueryExecutionFactory.create("SELECT * { ?s ?p ?o }", DatasetFactory.empty())) {
+            QueryExec qe  = QueryExecAdapter.adapt(qExec);
+            Assert.assertNotNull(qe);
+        }
+    }
 }