svn commit: r935372 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/util: TimeDuration.java test/TimeDurationTests.java

[ad...@apache.org]

Author: adrianc
Date: Sun Apr 18 17:52:01 2010
New Revision: 935372

URL: http://svn.apache.org/viewvc?rev=935372&view=rev
Log:
Fixed a bug in TimeDuration.java. Added test for same.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java?rev=935372&r1=935371&r2=935372&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java Sun Apr 18 17:52:01 2010
@@ -176,7 +176,7 @@ public class TimeDuration implements Ser
             return this.years == that.years && this.months == that.months && this.days == that.days
             && this.hours == that.hours && this.minutes == that.minutes && this.seconds == that.seconds
             && this.milliseconds == that.milliseconds;
-        } catch (ClassCastException e) {}
+        } catch (Exception e) {}
         return false;
     }
 

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java?rev=935372&r1=935371&r2=935372&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java Sun Apr 18 17:52:01 2010
@@ -142,6 +142,7 @@ public class TimeDurationTests extends G
     public void testDuration() throws Exception {
         Calendar now = Calendar.getInstance();
         TimeDuration zeroDuration = TimeDuration.ZeroTimeDuration;
+        assertFalse("zero equals null", zeroDuration.equals(null));
         Calendar newTime = (Calendar) now.clone();
         zeroDuration.addToCalendar(newTime);
         assertEquals("zero same calendar", now, newTime);