From 2ab72da7d6d30fe1f7fb3156eeac703c69f2f82a Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Sat, 11 May 2013 23:37:56 +0200
Subject: [PATCH] update to joda 2.2

---
 pom.xml                                            | 2 +-
 src/main/java/org/joda/time/base/BaseDateTime.java | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 44a25dd60a5..507d4e82d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
             <artifactId>joda-time</artifactId>
             <!-- joda 2.0 moved to using volatile fields for datetime -->
             <!-- 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>
         </dependency>
 
diff --git a/src/main/java/org/joda/time/base/BaseDateTime.java b/src/main/java/org/joda/time/base/BaseDateTime.java
index b3c391f748a..b49fd3b52a0 100644
--- a/src/main/java/org/joda/time/base/BaseDateTime.java
+++ b/src/main/java/org/joda/time/base/BaseDateTime.java
@@ -25,10 +25,6 @@ import org.joda.time.convert.InstantConverter;
 
 import java.io.Serializable;
 
-/**
- * WE COPIED THIS FILE TO REMOVE THE volatile from it!...
- */
-
 /**
  * BaseDateTime is an abstract implementation of ReadableDateTime that stores
  * 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
      */
+    // THIS IS THE ES CHANGE not to have it volatile...
     private long iMillis;
     /**
      * The chronology to use
      */
-    private Chronology iChronology;
+    private volatile Chronology iChronology;
 
     //-----------------------------------------------------------------------