Fixed date formatter

Author: mauriciotogneri

README.md

@@ -23,7 +23,7 @@ and the dependency:
 <dependency>
     <groupId>com.mauriciotogneri</groupId>
     <artifactId>javautils</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0</version>
 </dependency>
 ```
 
@@ -32,6 +32,6 @@ or if you use Gradle:
 ```groovy
 dependencies
 {
-    compile 'com.mauriciotogneri:javautils:0.5.0'
+    compile 'com.mauriciotogneri:javautils:0.6.0'
 }
 ```

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mauriciotogneri</groupId>
     <artifactId>javautils</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0</version>
     <name>Java Utils</name>
     <packaging>jar</packaging>
     <url>https://github.com/mauriciotogneri/java-utils</url>

src/main/java/com/mauriciotogneri/javautils/FormattedDateTime.java

@@ -58,11 +58,18 @@ private DateTimeParser[] parsers(String pattern, String... patterns)
 
     public String date(DateTime dateTime, DateTimeZone timeZone, Locale locale, String defaultValue)
     {
-        try
+        if ((dateTime != null) && (timeZone != null) && (locale != null))
         {
-            return formatter.withZone(timeZone).withLocale(locale).print(dateTime);
+            try
+            {
+                return formatter.withZone(timeZone).withLocale(locale).print(dateTime);
+            }
+            catch (Exception e)
+            {
+                return defaultValue;
+            }
         }
-        catch (Exception e)
+        else
         {
             return defaultValue;
         }
@@ -87,11 +94,18 @@ public String date(DateTime dateTime, Locale locale)
 
     public DateTime date(String timestamp, DateTimeZone timeZone, DateTime defaultValue)
     {
-        try
+        if ((timestamp != null) && (timeZone != null))
         {
-            return formatter.withZone(timeZone).parseDateTime(timestamp);
+            try
+            {
+                return formatter.withZone(timeZone).parseDateTime(timestamp);
+            }
+            catch (Exception e)
+            {
+                return defaultValue;
+            }
         }
-        catch (Exception e)
+        else
         {
             return defaultValue;
         }