You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pm...@apache.org on 2007/08/20 14:56:50 UTC

svn commit: r567677 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java

Author: pmahoney
Date: Mon Aug 20 05:56:49 2007
New Revision: 567677

URL: http://svn.apache.org/viewvc?rev=567677&view=rev
Log:
TOMAHAWK-964: Check for null value before setting seconds

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java?rev=567677&r1=567676&r2=567677&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/date/HtmlInputDate.java Mon Aug 20 05:56:49 2007
@@ -296,7 +296,7 @@
 	            	}
             		tempCalendar.set(Calendar.MINUTE,Integer.parseInt(minutes));
             		
-            		if (type.equals("full") || type.equals("time") || type.equals("short_time")) {
+            		if (seconds != null & (type.equals("full") || type.equals("time") || type.equals("short_time"))) {
 	            		tempCalendar.set(Calendar.SECOND,Integer.parseInt(seconds));
             		}
             	}