Return expression for getExpr. Aggregation is often over one expression.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8abe54da Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8abe54da Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8abe54da Branch: refs/heads/master Commit: 8abe54da96f14b8a4b0a63c34fc5e3d175010a0f Parents: 1818bb5 Author: Andy Seaborne <[email protected]> Authored: Tue Mar 8 09:17:34 2016 +0000 Committer: Andy Seaborne <[email protected]> Committed: Tue Mar 8 09:17:34 2016 +0000 ---------------------------------------------------------------------- .../apache/jena/sparql/expr/aggregate/AccumulatorExpr.java | 2 +- .../java/org/apache/jena/sparql/expr/aggregate/AggCustom.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/8abe54da/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java index d36dbe7..8393c51 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java @@ -26,7 +26,7 @@ import org.apache.jena.sparql.expr.NodeValue ; import org.apache.jena.sparql.function.FunctionEnv ; /** Accumulator that passes down every value of an expression */ -abstract class AccumulatorExpr implements Accumulator +public abstract class AccumulatorExpr implements Accumulator { private long count = 0 ; protected long errorCount = 0 ; http://git-wip-us.apache.org/repos/asf/jena/blob/8abe54da/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java index ab70376..9a2b2ec 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java @@ -111,7 +111,12 @@ public class AggCustom extends AggregatorBase public Node getValueEmpty() { return AggregateRegistry.getNoGroupValue(iri) ; } @Override - public Expr getExpr() { return null ; } + public Expr getExpr() { + if ( exprList.size() == 0 ) + return null; + else + return exprList.get(0); + } public String getIRI() { return iri ; }
