honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to joda 2.2

This commit is contained in:
Shay Banon 2013-05-11 23:37:56 +02:00
parent e09e3eb73b
commit 2ab72da7d6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -164,7 +164,7 @@
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<!-- joda 2.0 moved to using volatile fields for datetime --> <!-- joda 2.0 moved to using volatile fields for datetime -->
<!-- When updating to a new version, make sure to update our copy of BaseDateTime --> <!-- When updating to a new version, make sure to update our copy of BaseDateTime -->
<version>2.1</version> <version>2.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

7
src/main/java/org/joda/time/base/BaseDateTime.java
View File

@ -25,10 +25,6 @@ import org.joda.time.convert.InstantConverter;
import java.io.Serializable; import java.io.Serializable;
/**
* WE COPIED THIS FILE TO REMOVE THE volatile from it!...
*/
/** /**
* BaseDateTime is an abstract implementation of ReadableDateTime that stores * BaseDateTime is an abstract implementation of ReadableDateTime that stores
* data in <code>long</code> and <code>Chronology</code> fields. * data in <code>long</code> and <code>Chronology</code> fields.
@ -56,11 +52,12 @@ public abstract class BaseDateTime
/** /**
* 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; private long iMillis;
/** /**
* The chronology to use * The chronology to use
*/ */
private Chronology iChronology; private volatile Chronology iChronology;
//----------------------------------------------------------------------- //-----------------------------------------------------------------------