From: Tom Tromey Date: Tue, 2 Jul 2002 02:46:27 +0000 (+0000) Subject: re PR libgcj/7180 (possible bug in javax.naming.spi.NamingManager.getPlusPath()) X-Git-Tag: releases/gcc-3.3.0~4001 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49925aed134286e8c838cd84281b19cecd7dec1a;p=thirdparty%2Fgcc.git 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 84ae3a2b451c..e6d8de191927 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-07-01 Tom Tromey + + * 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 * java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed. diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java index 53eeb3a71b0c..d3f419f00b42 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,