You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2008/08/07 15:51:36 UTC
svn commit: r683618 -
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
Author: dashorst
Date: Thu Aug 7 06:51:35 2008
New Revision: 683618
URL: http://svn.apache.org/viewvc?rev=683618&view=rev
Log:
WICKET-1780 NPE in feedback panel
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?rev=683618&r1=683617&r2=683618&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java Thu Aug 7 06:51:35 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.panel;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -321,7 +322,8 @@
*/
protected Component newMessageDisplayComponent(String id, FeedbackMessage message)
{
- Label label = new Label(id, message.getMessage().toString());
+ Serializable serializable = message.getMessage();
+ Label label = new Label(id, (serializable == null) ? "" : serializable.toString());
label.setEscapeModelStrings(FeedbackPanel.this.getEscapeModelStrings());
return label;
}