commit 14eb2be614081ccb0af9a93ba4ed12717dc25e0c
author Andy Seaborne <andy@apache.org> Sun Dec 01 10:15:23 2019 +0000
committer GitHub <noreply@github.com> Sun Dec 01 10:15:23 2019 +0000
tree 3a8a9b33778c99a4e85b551328d6fe4db039b643
parent aee70d5424275765d08e4824c461d8f4188be056
parent 28edb3c389da384dd41d79e5234b9a6885213cd8

Merge pull request #643 from afs/jena1791_cmd-query

JENA-1791: Fix possible NPE in make(Query,Dataset)

jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java

diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java
index c77a5f5..dfbc981 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java
@@ -611,8 +611,10 @@
         }
     }
 
-    protected static QueryExecution make(Query query, Dataset dataset)
-    { return make(query, dataset.asDatasetGraph()); }
+    protected static QueryExecution make(Query query, Dataset dataset) {
+        DatasetGraph dsg = dataset==null ? null : dataset.asDatasetGraph();
+        return make(query, dsg);
+    }
 
     protected static QueryExecution make(Query query, DatasetGraph datasetGraph)
     { return QueryExecution.create().query(query).dataset(datasetGraph).build(); }