From 32e16cb0e60cba8057d47be45ab022ba92e254ad Mon Sep 17 00:00:00 2001 From: David Smiley Date: Thu, 12 May 2016 23:03:32 -0400 Subject: [PATCH] LUCENE-7278: DRPT: fix bug in assert statement (cherry picked from commit 1d35bd0) --- lucene/CHANGES.txt | 3 ++- .../lucene/spatial/prefix/tree/DateRangePrefixTree.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 2aab574ed8b..42510bb63b4 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -20,7 +20,8 @@ New Features queries with excluded bounds. (Adrien Grand) * LUCENE-7278: Spatial-extras DateRangePrefixTree's Calendar is now configurable, to - e.g. clear the Gregorian Change Date. (David Smiley) + e.g. clear the Gregorian Change Date. Also, toString(cal) is now identical to + DateTimeFormatter.ISO_INSTANT. (David Smiley) API Changes diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java index 9db34271185..4d3ef3b3c1d 100644 --- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java +++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java @@ -256,10 +256,10 @@ public class DateRangePrefixTree extends NumberRangePrefixTree { int assertEra = -1; assert (assertEra = (((Calendar)cal.clone()).get(Calendar.ERA))) >= 0;//a trick to only get this if assert enabled //note: Calendar.ERA == 0; - for (int f = field+1; f <= Calendar.MILLISECOND; f++) { + for (int f = field + 1; f <= Calendar.MILLISECOND; f++) { cal.clear(f); } - assert ((Calendar)cal.clone()).get(Calendar.ERA) == assertEra : "Calendar underflow"; + assert field + 1 == Calendar.ERA || ((Calendar)cal.clone()).get(Calendar.ERA) == assertEra : "Calendar underflow"; } /** Converts {@code value} from a {@link Calendar} or {@link Date} to a {@link Shape}. Other arguments