2006-02-28 Lillian Angel <langel@redhat.com>

        * javax/swing/text/DefaultFormatter.java
        (stringToValue): Added NPE check.

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d749cb34e..e1a8d67d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/text/DefaultFormatter.java
+	(stringToValue): Added NPE check.
+
 2006-02-28  Roman Kennke  <kennke@aicas.com>
 
 	PR classpath/25675
diff --git a/javax/swing/text/DefaultFormatter.java b/javax/swing/text/DefaultFormatter.java
index 245ff32f4..e42b1698a 100644
--- a/javax/swing/text/DefaultFormatter.java
+++ b/javax/swing/text/DefaultFormatter.java
@@ -367,7 +367,11 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
     Object value = string;
     Class valueClass = getValueClass();
     if (valueClass == null)
-      valueClass = getFormattedTextField().getValue().getClass();
+      {
+        JFormattedTextField jft = getFormattedTextField();
+        if (jft != null)
+          valueClass = jft.getValue().getClass();
+      }
     if (valueClass != null)
       try
         {