jena git commit: QueryEngineRef - Fix for GRAPH :g {}

[andy]

Repository: jena
Updated Branches:
  refs/heads/master 0d7c2cffa -> 6db4f0c08


QueryEngineRef - Fix for GRAPH :g {}


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6db4f0c0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6db4f0c0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6db4f0c0

Branch: refs/heads/master
Commit: 6db4f0c08102aed782be3e61f56de05bf9a7039f
Parents: 0d7c2cf
Author: Andy Seaborne <a...@apache.org>
Authored: Mon Apr 20 21:44:09 2015 +0100
Committer: Andy Seaborne <a...@apache.org>
Committed: Mon Apr 20 21:44:09 2015 +0100

----------------------------------------------------------------------
 .../java/com/hp/hpl/jena/sparql/engine/ref/Eval.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6db4f0c0/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/ref/Eval.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/ref/Eval.java 
b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/ref/Eval.java
index 23e73e5..c0d9a5f 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/ref/Eval.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/ref/Eval.java
@@ -22,6 +22,8 @@ import java.util.ArrayList ;
 import java.util.Iterator ;
 import java.util.List ;
 
+import org.apache.jena.atlas.lib.InternalErrorException ;
+
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ARQ ;
@@ -96,10 +98,13 @@ public class Eval
         
         if ( ! Var.isVar(opGraph.getNode()) )
         {
-            Graph graph = execCxt.getDataset().getGraph(opGraph.getNode()) ;
-            if ( graph == null )
-                // No such name in the dataset
+            DatasetGraph dsg = execCxt.getDataset() ;
+            Node graphNode = opGraph.getNode() ;
+            if ( ! dsg.containsGraph(graphNode) )
                 return new TableEmpty() ;
+            Graph graph = execCxt.getDataset().getGraph(opGraph.getNode()) ;
+            if ( graph == null ) // But contains was true?!!
+                throw new InternalErrorException("Graph was present, now it's 
not") ;
             ExecutionContext execCxt2 = new ExecutionContext(execCxt, graph) ;
             Evaluator e2 = EvaluatorFactory.create(execCxt2) ;
             return eval(e2, opGraph.getSubOp()) ;