| commit | e5094cdf6e75ecc873f05859ec2cd27d0fb038f4 | [log] [tgz] |
|---|---|---|
| author | Uwe Schindler <uschindler@apache.org> | Thu Sep 08 06:32:28 2011 +0000 |
| committer | Uwe Schindler <uschindler@apache.org> | Thu Sep 08 06:32:28 2011 +0000 |
| tree | 68871f87ebc8404290d3c6adc8790b61498a4463 | |
| parent | ef9377218d757920e42055ccba9f2a1b9daa1748 [diff] |
LUCENE-1768: Some final minor changes (deprecations and better check) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1166536 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java index c5ef2e0..b9de4ee 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java +++ b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java
@@ -28,7 +28,10 @@ /** * Builds a {@link TermRangeQuery} object from a {@link RangeQueryNode} object. + * + * @deprecated this builder will be removed in future together with {@link RangeQueryNode} */ +@Deprecated public class RangeQueryNodeBuilder implements StandardQueryBuilder { public RangeQueryNodeBuilder() {
diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/AbstractRangeQueryNode.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/AbstractRangeQueryNode.java index 9ad4783..6693da3 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/AbstractRangeQueryNode.java +++ b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/AbstractRangeQueryNode.java
@@ -148,8 +148,9 @@ String lowerField = StringUtils.toString(lower.getField()); String upperField = StringUtils.toString(upper.getField()); - if ((upperField == null && lowerField == null) - || (upperField != null && !upperField.equals(lowerField))) { + if ((upperField != null || lowerField != null) + && ((upperField != null && !upperField.equals(lowerField)) || !lowerField + .equals(upperField))) { throw new IllegalArgumentException( "lower and upper bounds should have the same field name!"); }