You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/06/09 16:07:39 UTC
[2/2] lucene-solr:master: SOLR-10855: Null pointer exceptions in
CartesianProductStream toExpression and explain methods
SOLR-10855: Null pointer exceptions in CartesianProductStream toExpression and explain methods
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/463907a1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/463907a1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/463907a1
Branch: refs/heads/master
Commit: 463907a13c461e35df4a260f2b7edc2a0adf122c
Parents: df74c65
Author: Joel Bernstein <jb...@apache.org>
Authored: Thu Jun 8 20:55:20 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Fri Jun 9 12:07:28 2017 -0400
----------------------------------------------------------------------
.../client/solrj/io/stream/CartesianProductStream.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/463907a1/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
index 6514ae4..c96b9fe 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
@@ -150,8 +150,10 @@ public class CartesianProductStream extends TupleStream implements Expressible {
for(NamedEvaluator evaluator : evaluators) {
expression.addParameter(String.format(Locale.ROOT, "%s as %s", evaluator.getEvaluator().toExpression(factory), evaluator.getName()));
}
-
- expression.addParameter(new StreamExpressionNamedParameter("productSort", orderBy.toExpression(factory)));
+
+ if(orderBy != null) {
+ expression.addParameter(new StreamExpressionNamedParameter("productSort", orderBy.toExpression(factory)));
+ }
return expression;
}
@@ -171,8 +173,10 @@ public class CartesianProductStream extends TupleStream implements Expressible {
for(NamedEvaluator evaluator : evaluators){
explanation.addHelper(evaluator.getEvaluator().toExplanation(factory));
}
-
- explanation.addHelper(orderBy.toExplanation(factory));
+
+ if(orderBy != null) {
+ explanation.addHelper(orderBy.toExplanation(factory));
+ }
return explanation;
}