This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: PR 7180
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 01 Jul 2002 20:56:45 -0600
- Subject: Patch: FYI: PR 7180
- Reply-to: tromey at redhat dot com
I'm checking this in. This comes from PR 7180 and seems reasonable to me.
Tom
Index: ChangeLog
from 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.
Index: javax/naming/spi/NamingManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/spi/NamingManager.java,v
retrieving revision 1.2
diff -u -r1.2 NamingManager.java
--- javax/naming/spi/NamingManager.java 24 Oct 2001 21:39:21 -0000 1.2
+++ javax/naming/spi/NamingManager.java 2 Jul 2002 02:45:04 -0000
@@ -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 @@
path = path2;
else if (path2 != null)
path += ":" + path2;
- return new StringTokenizer (path, ":");
+ return new StringTokenizer (path != null ? path : "", ":");
}
public static Object getObjectInstance (Object refInfo,