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 0f7225bf335b67876815787d60b836cb6d6a1462..bee1eb0d9071e35798d482721cc5d2a63f6a6fa6 100644 (file)
--- 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 06c321556f29d979172ff2071e2443990c733721..e3d59cb7d2465a03a0fe9169cc447feb5cbf04f7 100644 (file)
--- 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);
   }
 
   /**