From 49925aed134286e8c838cd84281b19cecd7dec1a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Jul 2002 02:46:27 +0000 Subject: 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 --- libjava/ChangeLog | 6 ++++++ libjava/javax/naming/spi/NamingManager.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 84ae3a2..e6d8de1 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 53eeb3a..d3f419f 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, -- cgit v1.1