Commit cb9b7827 by Michael Koch Committed by Michael Koch

2003-10-02 Michael Koch <konqueror@gmx.de>

	* java/net/URL.java
	(DEFAULT_SEARCH_PATH): New static variable.
	(ph_cache): Made it a HashMap.
	(getURLStreamHandler): Rename propVal to ph_search_path and use
	DEFAULT_SEARCH_PATH.

From-SVN: r72023
parent 7485f79f
2003-10-02 Michael Koch <konqueror@gmx.de> 2003-10-02 Michael Koch <konqueror@gmx.de>
* java/net/URL.java
(DEFAULT_SEARCH_PATH): New static variable.
(ph_cache): Made it a HashMap.
(getURLStreamHandler): Rename propVal to ph_search_path and use
DEFAULT_SEARCH_PATH.
2003-10-02 Michael Koch <konqueror@gmx.de>
* javax/swing/table/AbstractTableModel.java * javax/swing/table/AbstractTableModel.java
(findColumnName): Prevent from NullPointerException if argument (findColumnName): Prevent from NullPointerException if argument
columnName is null. columnName is null.
......
...@@ -43,10 +43,9 @@ import java.io.IOException; ...@@ -43,10 +43,9 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.util.Hashtable; import java.util.HashMap;
import java.util.StringTokenizer; import java.util.StringTokenizer;
/* /*
* Written using on-line Java Platform 1.2 API Specification, as well * Written using on-line Java Platform 1.2 API Specification, as well
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
...@@ -119,6 +118,9 @@ import java.util.StringTokenizer; ...@@ -119,6 +118,9 @@ import java.util.StringTokenizer;
*/ */
public final class URL implements Serializable public final class URL implements Serializable
{ {
private static final String DEFAULT_SEARCH_PATH =
"gnu.java.net.protocol|sun.net.www.protocol";
/** /**
* The name of the protocol for this URL. * The name of the protocol for this URL.
* The protocol is always stored in lower case. * The protocol is always stored in lower case.
...@@ -174,7 +176,7 @@ public final class URL implements Serializable ...@@ -174,7 +176,7 @@ public final class URL implements Serializable
* This a table where we cache protocol handlers to avoid the overhead * This a table where we cache protocol handlers to avoid the overhead
* of looking them up each time. * of looking them up each time.
*/ */
private static Hashtable ph_cache = new Hashtable(); private static HashMap ph_cache = new HashMap();
/** /**
* Whether or not to cache protocol handlers. * Whether or not to cache protocol handlers.
...@@ -798,12 +800,16 @@ public final class URL implements Serializable ...@@ -798,12 +800,16 @@ public final class URL implements Serializable
// to it, along with the JDK specified default as a last resort. // to it, along with the JDK specified default as a last resort.
// Except in very unusual environments the JDK specified one shouldn't // Except in very unusual environments the JDK specified one shouldn't
// ever be needed (or available). // ever be needed (or available).
String propVal = System.getProperty("java.protocol.handler.pkgs"); String ph_search_path = System.getProperty ("java.protocol.handler.pkgs");
propVal = (propVal == null) ? "" : (propVal + "|");
propVal = propVal + "gnu.gcj.protocol|sun.net.www.protocol"; // Tack our default package on at the ends.
if (ph_search_path != null)
ph_search_path += "|" + DEFAULT_SEARCH_PATH;
else
ph_search_path = DEFAULT_SEARCH_PATH;
// Finally loop through our search path looking for a match. // Finally loop through our search path looking for a match.
StringTokenizer pkgPrefix = new StringTokenizer (propVal, "|"); StringTokenizer pkgPrefix = new StringTokenizer (ph_search_path, "|");
do do
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment