Minor clean up

FasterXML · Sep 15, 2015 · ac758c2 · ac758c2
1 parent 53c7c9d
commit ac758c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java b/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java
@@ -204,7 +204,7 @@ public DateTimeFormatter createParser(DeserializationContext ctxt)
      * @return true if TimeZone is specified by caller; false otherwise.
      */
     public boolean isTimezoneExplicit() {
-    	return _explicitTimezone;
+        return _explicitTimezone;
     }
 
     /*

diff --git a/src/main/java/com/fasterxml/jackson/datatype/joda/deser/DateTimeDeserializer.java b/src/main/java/com/fasterxml/jackson/datatype/joda/deser/DateTimeDeserializer.java
@@ -45,10 +45,9 @@ public ReadableDateTime deserialize(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {
         JsonToken t = p.getCurrentToken();
-
-        DateTimeZone tz = _format.isTimezoneExplicit() ? _format.getTimeZone() : DateTimeZone.forTimeZone(ctxt.getTimeZone());
 
         if (t == JsonToken.VALUE_NUMBER_INT) {
+            DateTimeZone tz = _format.isTimezoneExplicit() ? _format.getTimeZone() : DateTimeZone.forTimeZone(ctxt.getTimeZone());
             return new DateTime(p.getLongValue(), tz);
         }
         if (t == JsonToken.VALUE_STRING) {
@@ -64,6 +63,7 @@ public ReadableDateTime deserialize(JsonParser p, DeserializationContext ctxt)
                 String tzId = (ix2 < ix)
                         ? str.substring(ix+1)
                         : str.substring(ix+1, ix2);
+                DateTimeZone tz;
                 try {
                     tz = DateTimeZone.forID(tzId);
                 } catch (IllegalArgumentException e) {
@@ -85,8 +85,8 @@ public ReadableDateTime deserialize(JsonParser p, DeserializationContext ctxt)
                         .parseDateTime(str)
                         .withZone(tz);
             }
-
             // Not sure if it should use timezone or not...
+            // 15-Sep-2015, tatu: impl of 'createParser()' SHOULD handle all timezone/locale setup
             return _format.createParser(ctxt).parseDateTime(str);
         }
         throw ctxt.mappingException(handledType());