re PR libgcj/7180 (possible bug in javax.naming.spi.NamingManager.getPlusPath())

	* javax/naming/spi/NamingManager.java (getPlusPath): Don't create
	StringTokenizer on null string.  For PR libgcj/7180.
	From daveho@cs.umd.edu.

From-SVN: r55166

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 84ae3a2b451ce5d13c8520c0ca0f7b87339cbfc6..e6d8de191927742cd42377408407fd2962ff4783 100644 (file)
--- 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 53eeb3a71b0c7ead55b7710e2f68359ec92a7700..d3f419f00b42ef6323a1008ca44b8e4f61e9185d 100644 (file)
--- 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,