From: Tom Tromey <tromey@redhat.com>
Date: Wed, 14 Dec 2005 18:36:55 +0000 (+0000)
Subject: re PR classpath/25389 (File(new URI("file:./")) -> java.lang.NullPointerException)
X-Git-Tag: releases/gcc-4.2.0~5354
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ce4312613bb39d065bb5d8d578d4c7f546d9ca7;p=thirdparty%2Fgcc.git

re PR classpath/25389 (File(new URI("file:./")) -> java.lang.NullPointerException)

	PR classpath/25389:
	* java/io/File.java (File): Throw IllegalArgumentException if URI is
	non-hierarchical.

From-SVN: r108528
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0f7225bf335b..bee1eb0d9071 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-14  Tom Tromey  <tromey@redhat.com>
+
+	PR classpath/25389:
+	* java/io/File.java (File): Throw IllegalArgumentException if URI is
+	non-hierarchical.
+
 2005-12-12  Andrew Haley  <aph@redhat.com>
 
 	* java/lang/VMCompiler.java: Directly generate a new instance of
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 06c321556f29..e3d59cb7d246 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -434,7 +434,11 @@ public class File implements Serializable, Comparable
     if (!uri.getScheme().equals("file"))
 	throw new IllegalArgumentException("invalid uri protocol");
 
-    path = normalizePath(uri.getPath());
+    String name = uri.getPath();
+    if (name == null)
+      throw new IllegalArgumentException("URI \"" + uri
+                     + "\" is not hierarchical");
+    path = normalizePath(name);
   }
 
   /**