From 3ce4312613bb39d065bb5d8d578d4c7f546d9ca7 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 14 Dec 2005 18:36:55 +0000
Subject: 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
---
 libjava/java/io/File.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'libjava/java')

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 06c3215..e3d59cb 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);
   }
 
   /**
-- 
cgit v1.1