svn commit: r683906 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java

[dashorst]

Author: dashorst
Date: Fri Aug  8 01:29:48 2008
New Revision: 683906

URL: http://svn.apache.org/viewvc?rev=683906&view=rev
Log:
WICKET-1780 NPE in feedback panel

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?rev=683906&r1=683905&r2=683906&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
 Fri Aug  8 01:29:48 2008
@@ -326,7 +326,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;
        }