summaryrefslogtreecommitdiffstats
path: root/libjava/javax/naming
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-02 02:46:27 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-02 02:46:27 +0000
commitdf3ef5c11068210e46e9db76bca62cf052982aa2 (patch)
treefe5b4de57e2db130d0e20b8ab5f6f79b64d6cf94 /libjava/javax/naming
parentcc7e2dde97ffdd84026ce33b247c33926eff19f2 (diff)
downloadppe42-gcc-df3ef5c11068210e46e9db76bca62cf052982aa2.tar.gz
ppe42-gcc-df3ef5c11068210e46e9db76bca62cf052982aa2.zip
* 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/javax/naming')
-rw-r--r--libjava/javax/naming/spi/NamingManager.java4
1 files changed, 2 insertions, 2 deletions
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,
OpenPOWER on IntegriCloud