diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-07-02 02:46:27 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-07-02 02:46:27 +0000 |
| commit | df3ef5c11068210e46e9db76bca62cf052982aa2 (patch) | |
| tree | fe5b4de57e2db130d0e20b8ab5f6f79b64d6cf94 /libjava | |
| parent | cc7e2dde97ffdd84026ce33b247c33926eff19f2 (diff) | |
| download | gcc-df3ef5c11068210e46e9db76bca62cf052982aa2.tar.gz | |
* javax/naming/spi/NamingManager.java (getPlusPath): Don't create
StringTokenizer on null string. For PR libgcj/7180.
From daveho@cs.umd.edu.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55166 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/javax/naming/spi/NamingManager.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 84ae3a2b451..e6d8de19192 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-07-01 Tom Tromey <tromey@redhat.com> + + * javax/naming/spi/NamingManager.java (getPlusPath): Don't create + StringTokenizer on null string. For PR libgcj/7180. + From daveho@cs.umd.edu. + 2002-06-24 Tom Tromey <tromey@redhat.com> * java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed. diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java index 53eeb3a71b0..d3f419f00b4 100644 --- a/libjava/javax/naming/spi/NamingManager.java +++ b/libjava/javax/naming/spi/NamingManager.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation +/* Copyright (C) 2000, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -166,7 +166,7 @@ public class NamingManager path = path2; else if (path2 != null) path += ":" + path2; - return new StringTokenizer (path, ":"); + return new StringTokenizer (path != null ? path : "", ":"); } public static Object getObjectInstance (Object refInfo, |