You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jo...@apache.org on 2007/06/06 09:41:40 UTC
svn commit: r544760 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Author: jonl
Date: Wed Jun 6 00:41:39 2007
New Revision: 544760
URL: http://svn.apache.org/viewvc?view=rev&rev=544760
Log:
Missed null check.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=544760&r1=544759&r2=544760
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Wed Jun 6 00:41:39 2007
@@ -1158,21 +1158,24 @@
*/
public final String getModelObjectAsString(final Object modelObject)
{
- // Get converter
- final IConverter converter = getConverter(modelObject.getClass());
-
- // Model string from property
- final String modelString = converter.convertToString(modelObject, getLocale());
-
- if (modelString != null)
+ if (modelObject != null)
{
- // If we should escape the markup
- if (getFlag(FLAG_ESCAPE_MODEL_STRINGS))
+ // Get converter
+ final IConverter converter = getConverter(modelObject.getClass());
+
+ // Model string from property
+ final String modelString = converter.convertToString(modelObject, getLocale());
+
+ if (modelString != null)
{
- // Escape it
- return Strings.escapeMarkup(modelString, false, true).toString();
+ // If we should escape the markup
+ if (getFlag(FLAG_ESCAPE_MODEL_STRINGS))
+ {
+ // Escape it
+ return Strings.escapeMarkup(modelString, false, true).toString();
+ }
+ return modelString;
}
- return modelString;
}
return "";
}