long and Chronology fields.
@@ -45,23 +44,16 @@ public abstract class BaseDateTime
extends AbstractDateTime
implements ReadableDateTime, Serializable {
- /**
- * Serialization lock
- */
+ /** Serialization lock */
private static final long serialVersionUID = -6728882245981L;
- /**
- * The millis from 1970-01-01T00:00:00Z
- */
+ /** The millis from 1970-01-01T00:00:00Z */
// THIS IS THE ES CHANGE not to have it volatile...
private long iMillis;
- /**
- * The chronology to use
- */
+ /** The chronology to use */
private volatile Chronology iChronology;
//-----------------------------------------------------------------------
-
/**
* Constructs an instance set to the current system millisecond time
* using ISOChronology in the default time zone.
@@ -76,7 +68,7 @@ public BaseDateTime() {
*
* If the specified time zone is null, the default zone is used.
*
- * @param zone the time zone, null means default zone
+ * @param zone the time zone, null means default zone
*/
public BaseDateTime(DateTimeZone zone) {
this(DateTimeUtils.currentTimeMillis(), ISOChronology.getInstance(zone));
@@ -89,19 +81,18 @@ public BaseDateTime(DateTimeZone zone) {
* If the chronology is null, ISOChronology
* in the default time zone is used.
*
- * @param chronology the chronology, null means ISOChronology in default zone
+ * @param chronology the chronology, null means ISOChronology in default zone
*/
public BaseDateTime(Chronology chronology) {
this(DateTimeUtils.currentTimeMillis(), chronology);
}
//-----------------------------------------------------------------------
-
/**
* Constructs an instance set to the milliseconds from 1970-01-01T00:00:00Z
* using ISOChronology in the default time zone.
*
- * @param instant the milliseconds from 1970-01-01T00:00:00Z
+ * @param instant the milliseconds from 1970-01-01T00:00:00Z
*/
public BaseDateTime(long instant) {
this(instant, ISOChronology.getInstance());
@@ -113,8 +104,8 @@ public BaseDateTime(long instant) {
*
* If the specified time zone is null, the default zone is used.
*
- * @param instant the milliseconds from 1970-01-01T00:00:00Z
- * @param zone the time zone, null means default zone
+ * @param instant the milliseconds from 1970-01-01T00:00:00Z
+ * @param zone the time zone, null means default zone
*/
public BaseDateTime(long instant, DateTimeZone zone) {
this(instant, ISOChronology.getInstance(zone));
@@ -127,21 +118,17 @@ public BaseDateTime(long instant, DateTimeZone zone) {
* If the chronology is null, ISOChronology
* in the default time zone is used.
*
- * @param instant the milliseconds from 1970-01-01T00:00:00Z
- * @param chronology the chronology, null means ISOChronology in default zone
+ * @param instant the milliseconds from 1970-01-01T00:00:00Z
+ * @param chronology the chronology, null means ISOChronology in default zone
*/
public BaseDateTime(long instant, Chronology chronology) {
super();
iChronology = checkChronology(chronology);
iMillis = checkInstant(instant, iChronology);
- // validate not over maximum
- if (iChronology.year().isSupported()) {
- iChronology.year().set(iMillis, iChronology.year().get(iMillis));
- }
+ adjustForMinMax();
}
//-----------------------------------------------------------------------
-
/**
* Constructs an instance from an Object that represents a datetime,
* forcing the time zone to that specified.
@@ -153,8 +140,8 @@ public BaseDateTime(long instant, Chronology chronology) {
* {@link org.joda.time.convert.ConverterManager ConverterManager} and
* include ReadableInstant, String, Calendar and Date.
*
- * @param instant the datetime object
- * @param zone the time zone
+ * @param instant the datetime object
+ * @param zone the time zone
* @throws IllegalArgumentException if the instant is invalid
*/
public BaseDateTime(Object instant, DateTimeZone zone) {
@@ -163,6 +150,7 @@ public BaseDateTime(Object instant, DateTimeZone zone) {
Chronology chrono = checkChronology(converter.getChronology(instant, zone));
iChronology = chrono;
iMillis = checkInstant(converter.getInstantMillis(instant, chrono), chrono);
+ adjustForMinMax();
}
/**
@@ -175,8 +163,8 @@ public BaseDateTime(Object instant, DateTimeZone zone) {
* {@link org.joda.time.convert.ConverterManager ConverterManager} and
* include ReadableInstant, String, Calendar and Date.
*
- * @param instant the datetime object
- * @param chronology the chronology
+ * @param instant the datetime object
+ * @param chronology the chronology
* @throws IllegalArgumentException if the instant is invalid
*/
public BaseDateTime(Object instant, Chronology chronology) {
@@ -184,21 +172,21 @@ public BaseDateTime(Object instant, Chronology chronology) {
InstantConverter converter = ConverterManager.getInstance().getInstantConverter(instant);
iChronology = checkChronology(converter.getChronology(instant, chronology));
iMillis = checkInstant(converter.getInstantMillis(instant, chronology), iChronology);
+ adjustForMinMax();
}
//-----------------------------------------------------------------------
-
/**
* Constructs an instance from datetime field values
* using ISOChronology in the default time zone.
*
- * @param year the year
- * @param monthOfYear the month of the year
- * @param dayOfMonth the day of the month
- * @param hourOfDay the hour of the day
- * @param minuteOfHour the minute of the hour
- * @param secondOfMinute the second of the minute
- * @param millisOfSecond the millisecond of the second
+ * @param year the year
+ * @param monthOfYear the month of the year
+ * @param dayOfMonth the day of the month
+ * @param hourOfDay the hour of the day
+ * @param minuteOfHour the minute of the hour
+ * @param secondOfMinute the second of the minute
+ * @param millisOfSecond the millisecond of the second
*/
public BaseDateTime(
int year,
@@ -218,14 +206,14 @@ public BaseDateTime(
*
* If the specified time zone is null, the default zone is used.
*
- * @param year the year
- * @param monthOfYear the month of the year
- * @param dayOfMonth the day of the month
- * @param hourOfDay the hour of the day
- * @param minuteOfHour the minute of the hour
- * @param secondOfMinute the second of the minute
- * @param millisOfSecond the millisecond of the second
- * @param zone the time zone, null means default time zone
+ * @param year the year
+ * @param monthOfYear the month of the year
+ * @param dayOfMonth the day of the month
+ * @param hourOfDay the hour of the day
+ * @param minuteOfHour the minute of the hour
+ * @param secondOfMinute the second of the minute
+ * @param millisOfSecond the millisecond of the second
+ * @param zone the time zone, null means default time zone
*/
public BaseDateTime(
int year,
@@ -247,14 +235,14 @@ public BaseDateTime(
* If the chronology is null, ISOChronology
* in the default time zone is used.
*
- * @param year the year
- * @param monthOfYear the month of the year
- * @param dayOfMonth the day of the month
- * @param hourOfDay the hour of the day
- * @param minuteOfHour the minute of the hour
- * @param secondOfMinute the second of the minute
- * @param millisOfSecond the millisecond of the second
- * @param chronology the chronology, null means ISOChronology in default zone
+ * @param year the year
+ * @param monthOfYear the month of the year
+ * @param dayOfMonth the day of the month
+ * @param hourOfDay the hour of the day
+ * @param minuteOfHour the minute of the hour
+ * @param secondOfMinute the second of the minute
+ * @param millisOfSecond the millisecond of the second
+ * @param chronology the chronology, null means ISOChronology in default zone
*/
public BaseDateTime(
int year,
@@ -270,17 +258,23 @@ public BaseDateTime(
long instant = iChronology.getDateTimeMillis(year, monthOfYear, dayOfMonth,
hourOfDay, minuteOfHour, secondOfMinute, millisOfSecond);
iMillis = checkInstant(instant, iChronology);
+ adjustForMinMax();
}
- //-----------------------------------------------------------------------
+ private void adjustForMinMax() {
+ if (iMillis == Long.MIN_VALUE || iMillis == Long.MAX_VALUE) {
+ iChronology = iChronology.withUTC();
+ }
+ }
+ //-----------------------------------------------------------------------
/**
* Checks the specified chronology before storing it, potentially altering it.
* This method must not access any instance variables.
*
* This implementation converts nulls to ISOChronology in the default zone. * - * @param chronology the chronology to use, may be null + * @param chronology the chronology to use, may be null * @return the chronology to store in this datetime, not null */ protected Chronology checkChronology(Chronology chronology) { @@ -293,8 +287,8 @@ protected Chronology checkChronology(Chronology chronology) { *
* This implementation simply returns the instant. * - * @param instant the milliseconds from 1970-01-01T00:00:00Z to round - * @param chronology the chronology to use, not null + * @param instant the milliseconds from 1970-01-01T00:00:00Z to round + * @param chronology the chronology to use, not null * @return the instant to store in this datetime */ protected long checkInstant(long instant, Chronology chronology) { @@ -302,14 +296,12 @@ protected long checkInstant(long instant, Chronology chronology) { } //----------------------------------------------------------------------- - /** * Gets the milliseconds of the datetime instant from the Java epoch * of 1970-01-01T00:00:00Z. * * @return the number of milliseconds since 1970-01-01T00:00:00Z */ - @Override public long getMillis() { return iMillis; } @@ -319,20 +311,18 @@ public long getMillis() { * * @return the Chronology that the datetime is using */ - @Override public Chronology getChronology() { return iChronology; } //----------------------------------------------------------------------- - /** * Sets the milliseconds of the datetime. *
* All changes to the millisecond field occurs via this method.
* Override and block this method to make a subclass immutable.
*
- * @param instant the milliseconds since 1970-01-01T00:00:00Z to set the datetime to
+ * @param instant the milliseconds since 1970-01-01T00:00:00Z to set the datetime to
*/
protected void setMillis(long instant) {
iMillis = checkInstant(instant, iChronology);
@@ -344,7 +334,7 @@ protected void setMillis(long instant) {
* All changes to the chronology field occurs via this method.
* Override and block this method to make a subclass immutable.
*
- * @param chronology the chronology to set
+ * @param chronology the chronology to set
*/
protected void setChronology(Chronology chronology) {
iChronology = checkChronology(chronology);
diff --git a/distribution/licenses/joda-convert-1.2.jar.sha1 b/distribution/licenses/joda-convert-1.2.jar.sha1
deleted file mode 100644
index 37c3e87058082..0000000000000
--- a/distribution/licenses/joda-convert-1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-35ec554f0cd00c956cc69051514d9488b1374dec
diff --git a/distribution/licenses/joda-convert-LICENSE.txt b/distribution/licenses/joda-convert-LICENSE.txt
deleted file mode 100644
index 75b52484ea471..0000000000000
--- a/distribution/licenses/joda-convert-LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/distribution/licenses/joda-convert-NOTICE.txt b/distribution/licenses/joda-convert-NOTICE.txt
deleted file mode 100644
index dffbcf31cacf6..0000000000000
--- a/distribution/licenses/joda-convert-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-=============================================================================
-= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
-=============================================================================
-This product includes software developed by
-Joda.org (http://www.joda.org/).
diff --git a/distribution/licenses/joda-time-2.9.4.jar.sha1 b/distribution/licenses/joda-time-2.9.4.jar.sha1
deleted file mode 100644
index e9ea891bfeee2..0000000000000
--- a/distribution/licenses/joda-time-2.9.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c295b462f16702ebe720bbb08f62e1ba80da41b
\ No newline at end of file
diff --git a/distribution/licenses/joda-time-2.9.5.jar.sha1 b/distribution/licenses/joda-time-2.9.5.jar.sha1
new file mode 100644
index 0000000000000..ecf1c781556ee
--- /dev/null
+++ b/distribution/licenses/joda-time-2.9.5.jar.sha1
@@ -0,0 +1 @@
+5f01da7306363fad2028b916f3eab926262de928
\ No newline at end of file
diff --git a/modules/pom.xml b/modules/pom.xml
index 0c6cc0129dd37..9c0a634ce834f 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -133,11 +133,6 @@