[jena] branch master updated: JENA-1791: Fix possible NPE in make(Query, Dataset)

[andy]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/master by this push:
     new 28edb3c  JENA-1791: Fix possible NPE in make(Query,Dataset)
     new 14eb2be  Merge pull request #643 from afs/jena1791_cmd-query
28edb3c is described below

commit 28edb3c389da384dd41d79e5234b9a6885213cd8
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Sat Nov 30 20:30:35 2019 +0000

    JENA-1791: Fix possible NPE in make(Query,Dataset)
---
 .../src/main/java/org/apache/jena/query/QueryExecutionFactory.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 @@ public class QueryExecutionFactory
         }
     }
 
-    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(); }