From 97b8365cafc3a344a22d3980b8ed885f5c6d8357 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Tue, 9 Jan 2007 19:58:05 +0000
Subject: Merged gcj-eclipse branch to trunk.

From-SVN: r120621
---
 libjava/classpath/java/net/URL.java | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'libjava/classpath/java/net/URL.java')

diff --git a/libjava/classpath/java/net/URL.java b/libjava/classpath/java/net/URL.java
index ed7decc7992..8f72d0687e4 100644
--- a/libjava/classpath/java/net/URL.java
+++ b/libjava/classpath/java/net/URL.java
@@ -322,7 +322,8 @@ public final class URL implements Serializable
    */
   public URL(String spec) throws MalformedURLException
   {
-    this((URL) null, spec != null ? spec : "", (URLStreamHandler) null);
+    this((URL) null, spec != null ? spec : "", (URLStreamHandler) null,
+	 false);
   }
 
   /**
@@ -343,7 +344,9 @@ public final class URL implements Serializable
    */
   public URL(URL context, String spec) throws MalformedURLException
   {
-    this(context, spec, (context == null) ? (URLStreamHandler)null : context.ph);
+    this(context, spec,
+	 (context == null) ? (URLStreamHandler) null : context.ph,
+	 false);
   }
 
   /**
@@ -376,6 +379,23 @@ public final class URL implements Serializable
    */
   public URL(URL context, String spec, URLStreamHandler ph)
     throws MalformedURLException
+  {
+    this(context, spec, ph, true);
+  }
+
+  /**
+   * Private constructor called by all other constructors taking
+   * a context and spec.
+   *
+   * @param context The context in which to parse the specification
+   * @param spec The string to parse as an URL
+   * @param ph The stream handler for the URL
+   * @param phFromUser Whether or not the user supplied the URLStreamHandler
+   *
+   */
+  private URL(URL context, String spec, URLStreamHandler ph,
+	      boolean phFromUser)
+    throws MalformedURLException
   {
     /* A protocol is defined by the doc as the substring before a ':'
      * as long as the ':' occurs before any '/'.
@@ -397,7 +417,11 @@ public final class URL implements Serializable
     if ((colon = spec.indexOf("://", 1)) > 0
 	&& ((colon < slash || slash < 0))
         && ! spec.regionMatches(colon, "://:", 0, 4))
-      context = null;
+      {
+	context = null;
+	if (! phFromUser)
+	  ph = null;
+      }
 
     boolean protocolSpecified = false;
 
@@ -458,7 +482,7 @@ public final class URL implements Serializable
     if (ph != null)
       {
 	SecurityManager s = System.getSecurityManager();
-	if (s != null)
+	if (s != null && phFromUser)
 	  s.checkPermission(new NetPermission("specifyStreamHandler"));
 
 	this.ph = ph;
-- 
cgit v1.2.3