This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: FYI: updated expected diffs


java.net.URL purposely differs from Classpath.
I'm checking this in to inform the nightly comparison machinery.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* expected/java.net.URL.diff: New file.

Index: expected/java.net.URL.diff
===================================================================
RCS file: expected/java.net.URL.diff
diff -N expected/java.net.URL.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ expected/java.net.URL.diff 27 Sep 2004 20:37:11 -0000
@@ -0,0 +1,27 @@
+--- /home/tromey/gnu/Nightly/classpath/classpath/java/net/URL.java	2004-09-24 02:31:49.000000000 -0600
++++ java/net/URL.java	2004-09-24 02:16:14.000000000 -0600
+@@ -856,6 +856,24 @@
+       {
+ 	ph = factory.createURLStreamHandler(protocol);
+       }
++    else if (protocol.equals("core"))
++      {
++ 	ph = new gnu.java.net.protocol.core.Handler();
++      }
++    else if (protocol.equals("file"))
++      {
++	// This is an interesting case.  It's tempting to think that we
++	// could call Class.forName ("gnu.java.net.protocol.file.Handler") to
++	// get the appropriate class.  Unfortunately, if we do that the
++	// program will never terminate, because getURLStreamHandler is
++	// eventually called by Class.forName.
++	//
++	// Treating "file" as a special case is the minimum that will
++	// fix this problem.  If other protocols are required in a
++	// statically linked application they will need to be handled in
++	// the same way as "file".
++	ph = new gnu.java.net.protocol.file.Handler();
++      }
+ 
+     // Non-default factory may have returned null or a factory wasn't set.
+     // Use the default search algorithm to find a handler for this protocol.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]