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 2007/02/20 23:55:47 UTC

svn commit: r509795 - in /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag: MessageRenderer.java MessagesRenderer.java

Author: bommel
Date: Tue Feb 20 14:55:47 2007
New Revision: 509795

URL: http://svn.apache.org/viewvc?view=rev&rev=509795
Log:
avoid NPE if render Messages

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

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java?view=diff&rev=509795&r1=509794&r2=509795
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java Tue Feb 20 14:55:47 2007
@@ -84,7 +84,12 @@
       writer.startElement(HtmlConstants.LABEL, null);
       writer.writeAttribute(HtmlAttributes.FOR, clientId, null);
       writer.writeAttribute(HtmlAttributes.TITLE, message.getDetail(), null);
-      writer.writeText(message.getSummary(), null);
+      String summary = message.getSummary();
+      if (summary != null) {
+        writer.writeText(summary, null);
+      } else {
+        writer.writeText("", null);
+      }
       writer.endElement(HtmlConstants.LABEL);
 
       writer.startElement(HtmlConstants.BR, null);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?view=diff&rev=509795&r1=509794&r2=509795
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Tue Feb 20 14:55:47 2007
@@ -117,7 +117,12 @@
       writer.writeAttribute(HtmlAttributes.FOR, clientId, null);
     }
     writer.writeAttribute(HtmlAttributes.TITLE, message.getDetail(), null);
-    writer.writeText(message.getSummary(), null);
+    String summary = message.getSummary();
+    if (summary != null) {
+      writer.writeText(summary, null);
+    } else {
+      writer.writeText("", null);
+    }
     writer.endElement(HtmlConstants.LABEL);
     writer.startElement(HtmlConstants.BR, null);
     writer.endElement(HtmlConstants.BR);