From bc5ace0e9460ae979079532f610a88b6363e96e5 Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Thu, 17 Mar 2016 14:56:08 +0000
Subject: [PATCH] Fix to ElementTransformer for GRAPH.

---
 .../syntaxtransform/ElementTransformer.java   |  6 ++----
 .../syntaxtransform/TestSyntaxTransform.java  | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
index 04d229962a7..4a741e4fd83 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
@@ -204,7 +204,7 @@ private boolean transformFromTo(List<Element> elts, List<Element> elts2) {
         public void visit(ElementDataset el) {
             Element sub = pop() ;
             Element el2 = transform.transform(el, sub) ;
-            push(el) ;
+            push(el2) ;
         }
 
         @Override
@@ -212,7 +212,7 @@ public void visit(ElementNamedGraph el) {
             Node n = el.getGraphNameNode() ;
             Node n1 = transformNode(n) ;
             Element elt1 = pop() ;
-            Element el2 = transform.transform(el, n, elt1) ; 
+            Element el2 = transform.transform(el, n1, elt1) ; 
             push(el2) ;
         }
 
@@ -252,10 +252,8 @@ public void visit(ElementMinus el) {
 
         @Override
         public void visit(ElementService el) {
-            boolean b = el.getSilent() ;
             Node n = el.getServiceNode() ;
             Node n1 = transformNode(n) ;
-            Element elt = el.getElement() ;
             Element elt1 = pop() ;
             Element el2 = transform.transform(el, n1, elt1) ;
             push(el2) ;
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
index c09f0fef739..23d9f9bff35 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
@@ -76,11 +76,22 @@ public class TestSyntaxTransform extends BaseTest
                   "o", "1");
     }
 
-    @Test public void subst_query_11() { testQuery
-        ("SELECT * { ?s ?p ?o { SELECT ?x { ?x ?p ?o } } }",
-         "SELECT * { ?s ?p 1  { SELECT ?x { ?x ?p 1 } } }",
-         "o", "1") ; }
+    @Test public void subst_query_11() { 
+        testQuery("SELECT * { ?s ?p ?o { SELECT ?x { ?x ?p ?o } } }",
+                  "SELECT * { ?s ?p 1  { SELECT ?x { ?x ?p 1 } } }",
+                  "o", "1") ; }
+
+    @Test public void subst_query_20() { 
+        testQuery("SELECT * { ?s ?p ?g GRAPH ?g { ?s ?p ?g } }",
+                  "SELECT * { ?s ?p <urn:graph> GRAPH <urn:graph> { ?s ?p <urn:graph> } }",
+                  "g", "<urn:graph>") ; }
 
+    @Test public void subst_query_21() { 
+        testQuery("SELECT * { ?s ?p ?srv SERVICE ?srv { ?s ?p ?srv}}",
+                  "SELECT * { ?s ?p <urn:service> SERVICE <urn:service> { ?s ?p <urn:service>}}",
+                  "srv", "<urn:service>") ; }
+
+    
     @Test public void subst_update_01() { 
         testUpdate("DELETE { ?s <urn:p> ?x } WHERE {}", 
                    "DELETE { ?s <urn:p> <urn:x> } WHERE {}",