[OFBiz] SVN: r6520 - trunk/base/src/base/org/ofbiz/base/util

[jaz@svn.ofbiz.org]

Author: jaz
Date: 2006-01-17 11:02:40 -0600 (Tue, 17 Jan 2006)
New Revision: 6520

Modified:
   trunk/base/src/base/org/ofbiz/base/util/UtilDateTime.java
Log:
fixed possible NPE


Modified: trunk/base/src/base/org/ofbiz/base/util/UtilDateTime.java
===================================================================
--- trunk/base/src/base/org/ofbiz/base/util/UtilDateTime.java	2006-01-17 08:17:22 UTC (rev 6519)
+++ trunk/base/src/base/org/ofbiz/base/util/UtilDateTime.java	2006-01-17 17:02:40 UTC (rev 6520)
@@ -301,7 +301,9 @@
     
     public static java.util.Calendar toCalendar(java.sql.Timestamp stamp) {
         Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(stamp.getTime());
+        if (stamp != null) {
+            cal.setTimeInMillis(stamp.getTime());
+        }
         return cal;
     }