You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/06/21 13:45:51 UTC

svn commit: r415967 - /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java

Author: bommel
Date: Wed Jun 21 04:45:51 2006
New Revision: 415967

URL: http://svn.apache.org/viewvc?rev=415967&view=rev
Log:
avoid NPE

Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=415967&r1=415966&r2=415967&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Wed Jun 21 04:45:51 2006
@@ -102,7 +102,7 @@
   private void applyConverterPattern(UIPopup popup, String converterPattern) {
     UIComponent box = (UIComponent) popup.getChildren().get(0);
     UIComponent timePanel = box.findComponent("timePanel");
-    if (converterPattern.indexOf('h') > -1 || converterPattern.indexOf('H') > -1) {
+    if (converterPattern != null && (converterPattern.indexOf('h') > -1 || converterPattern.indexOf('H') > -1)) {
       if (converterPattern.indexOf('s') > -1) {
         UIComponent time = timePanel.findComponent("time");
         time.getAttributes().put(ATTR_POPUP_CALENDAR_FORCE_TIME, true);