You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/12/28 20:05:43 UTC

[4/4] jena git commit: Bug fix for repeated use of transformation in ExprLists

Bug fix for repeated use of transformation in ExprLists

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

Branch: refs/heads/master
Commit: 66efb4f658e5c227c29cba0f3f8d1b186a28bd10
Parents: 748180a
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 28 19:04:29 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 28 19:04:29 2014 +0000

----------------------------------------------------------------------
 .../java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/66efb4f6/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
index b6c4271..ac1db00 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
@@ -72,9 +72,12 @@ public class ExprTransformer
         
         final Expr result()
         { 
-            if ( stack.size() != 1 )
-                Log.warn(this, "Stack is not aligned") ;
-            return stack.peek() ; 
+            if ( stack.size() != 1 ) {
+                Log.warn(this, "Stack is not aligned (size = "+stack.size()+")") ;
+                if ( stack.isEmpty() )
+                    return null ;
+            }
+            return stack.pop() ; 
         }
 
         ApplyExprTransformVisitor(ExprTransform transform)