Slight improvement to handling null values
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java b/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
index c4868b7..792f593 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
@@ -224,7 +224,7 @@
public Value(String p, Shape sh, Locale l, TimeZone tz)
{
pattern = p;
- shape = sh;
+ shape = (sh == null) ? Shape.ANY : sh;
locale = l;
_timezone = tz;
timezoneStr = null;
@@ -236,7 +236,7 @@
public Value(String p, Shape sh, Locale l, String tzStr, TimeZone tz)
{
pattern = p;
- shape = sh;
+ shape = (sh == null) ? Shape.ANY : sh;
locale = l;
_timezone = tz;
timezoneStr = tzStr;
@@ -294,7 +294,8 @@
if (timezoneStr == null) {
return null;
}
- _timezone = tz = TimeZone.getTimeZone(timezoneStr);
+ tz = TimeZone.getTimeZone(timezoneStr);
+ _timezone = tz;
}
return tz;
}