You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2018/10/14 10:21:58 UTC

[2/6] jena git commit: fixes JENA-1515

fixes JENA-1515

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

Branch: refs/heads/master
Commit: a499b58a76704125f63a8407ffb2795b03e4d213
Parents: 439f6ba
Author: Claude Warren <cl...@xenei.com>
Authored: Sun Sep 30 12:53:31 2018 +0100
Committer: Claude Warren <cl...@xenei.com>
Committed: Sun Sep 30 12:53:31 2018 +0100

----------------------------------------------------------------------
 .../arq/querybuilder/rewriters/ElementRewriter.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a499b58a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
index 4a9a56a..5526c1f 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
@@ -103,17 +103,13 @@ public class ElementRewriter extends AbstractRewriter<Element> implements
 	@Override
 	public void visit(ElementData el) {
 		ElementData retval = new ElementData();
-		Iterator<Var> vars = el.getVars().iterator();
-		Iterator<Binding> bindings = el.getRows().iterator();
-		while (vars.hasNext()) {
-			Var v = vars.next();
-			if (values.containsKey(v)) {
-				bindings.next(); // skip the binding
-			} else {
-				retval.add(v);
-				retval.add(rewrite(bindings.next()));
-			}
+		for (Var v : el.getVars()) {
+			retval.add(v);
 		}
+		for (Binding binding : el.getRows())
+		{
+			retval.add( binding );
+		}		
 		push(retval);
 
 	}