summaryrefslogtreecommitdiff
path: root/javax/swing/JTextField.java
diff options
context:
space:
mode:
Diffstat (limited to 'javax/swing/JTextField.java')
-rw-r--r--javax/swing/JTextField.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/javax/swing/JTextField.java b/javax/swing/JTextField.java
index 4f284d8d5..5ae9c9f1a 100644
--- a/javax/swing/JTextField.java
+++ b/javax/swing/JTextField.java
@@ -15,8 +15,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -197,7 +197,7 @@ public class JTextField extends JTextComponent
public void insertString(int offset, String str, AttributeSet a)
throws BadLocationException
{
- if (str.indexOf('\n') == -1)
+ if (str != null && str.indexOf('\n') == -1)
super.insertString(offset, str, a);
}
};