summaryrefslogtreecommitdiff
path: root/javax/swing/text/InternationalFormatter.java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-01-10 15:59:36 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-01-10 15:59:36 +0000
commite2880df85352a4f46c1fc8b28c4cd08540a2daed (patch)
treeaee81230bdbf73bd817662e0ce7a4665939ab41d /javax/swing/text/InternationalFormatter.java
parent05f169147352fa3eeb9726f3d57597a83eb7d64d (diff)
downloadclasspath-e2880df85352a4f46c1fc8b28c4cd08540a2daed.tar.gz
2006-01-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of HEAD --> generics branch for the period 2005/11/27 to 2006/01/09.
Diffstat (limited to 'javax/swing/text/InternationalFormatter.java')
-rw-r--r--javax/swing/text/InternationalFormatter.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/javax/swing/text/InternationalFormatter.java b/javax/swing/text/InternationalFormatter.java
index a7ed18166..ba3cffaba 100644
--- a/javax/swing/text/InternationalFormatter.java
+++ b/javax/swing/text/InternationalFormatter.java
@@ -228,6 +228,8 @@ public class InternationalFormatter
public String valueToString(Object value)
throws ParseException
{
+ if (value == null)
+ return "";
if (format != null)
return format.format(value);
else