Fix for java.net.URL

[Pavel Roskin]

Hello!

The attached patch makes Hotjava-1.1.5 run much further that before.
In fact, I don't even know how to compare strings safely, so write it
better if you can.

Another attachement shows how Kaffe dies now. Something must be wrong
with threads. You can take my command line from there.

Just in case, about my machine:
Linux-2.2.5, i686, GLibc-2.1.1, egcs-1.1.2
Kaffe (current, from CVS) configured by default.

Pavel Roskin
-------------- next part --------------
Index: libraries/javalib/java/net/URL.java
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/javalib/java/net/URL.java,v
retrieving revision 1.12
diff -u -r1.12 URL.java
--- URL.java	1999/03/25 07:46:45	1.12
+++ URL.java	1999/04/16 09:28:07
@@ -137,7 +137,8 @@
 	    this.host.equals(that.host) &&
 	    this.port == that.port &&
 	    this.file.equals(that.file) &&
-			this.ref.equals(that.ref) ) {
+	    ( ( (this.ref == null) && (that.ref == null ) ) ||
+			this.ref.equals(that.ref) ) ) {
 		return (true);
 	}
 	return (false);
-------------- next part --------------
[Starting HotJava]
[Initializing globals]
[Creating frame]
java.lang.UnsatisfiedLinkError: Failed to locate native function:	sun/awt/image/GifImageDecoder.parseImage(IIIIZI[B[BLjava/awt/image/IndexColorModel;)Z
	at sun.awt.image.GifImageDecoder.produceImage(GifImageDecoder.java:227)
	at sun.awt.image.InputStreamImageSource.doFetch(InputStreamImageSource.java:257)
	at sun.awt.image.ImageFetcher.fetchloop(ImageFetcher.java:143)
	at sun.awt.image.ImageFetcher.run(ImageFetcher.java:119)
sunw.hotjava.doc.DocException: Conversion 8859_1 not found.
	at java.lang.Throwable.<init>(Throwable.java:40)
	at java.lang.Exception.<init>(Exception.java:21)
	at sunw.hotjava.doc.DocException.<init>(DocException.java:40)
	at sunw.hotjava.ui.HotList.readHTMLFile(HotList.java:1624)
	at sunw.hotjava.ui.HotListReader.run(HotListReader.java:63)
	at java.lang.Thread.run(Thread.java:241)
Dumping dynamic locks:
lock at 0x8327d20 sun/misc/VMNotifierThread  (uncontended)
  waiting to be signaled are: `Alloc State Notifier'
lock at 0x8508a40 java/awt/MediaTracker 
  held by `main'
  blocks threads: 
lock at 0x80b4840 sun/misc/VMNotifierThread  (uncontended)
  waiting to be signaled are: `Red Alloc State Notifier'
lock at 0x82f7750 java/lang/Object  (uncontended)
  waiting to be signaled are: `Request Processor'
lock at 0x839eb58 java/awt/MediaTrackerEntry  (uncontended)
  waiting to be signaled are: `main'
lock at 0x833d2f8 sunw/hotjava/ui/EditorFrame 
  held by `main'
  blocks threads: 
Dumping static locks:
&gcman  (uncontended)
  waiting to be signaled are: `gc'
&finman  (uncontended)
  waiting to be signaled are: `finaliser'
&thread_start_lock  (uncontended)
&translatorlock  (uncontended)
&jarlock  (uncontended)
&classHashLock  (uncontended)
&utf8Lock  (uncontended)
&stringLock  (uncontended)
&gc_lock  (uncontended)
Dumping live threads:
`Alloc State Notifier' tid 0x83e0010, status SUSPENDED flags DONTSTOP 
 blocked at 0x81c1d80 (0x83e0010->|) 
`Red Alloc State Notifier' tid 0x83d5010, status SUSPENDED flags DONTSTOP 
 blocked at 0x80a9250 (0x83d5010->|) 
`Request Processor' tid 0x831e010, status SUSPENDED flags DONTSTOP 
 blocked at 0x81c1550 (0x831e010->|) 
`gc' tid 0x8135010, status SUSPENDED flags DONTSTOP 
 blocked at 0x8109f70 (0x8135010->|) 
`finaliser' tid 0x812c010, status SUSPENDED flags DONTSTOP 
 blocked at 0x8109f50 (0x812c010->|) 
`main' tid 0x80a8030, status SUSPENDED flags NOSTACKALLOC DONTSTOP 
 blocked at 0x80a92f0 (0x80a8030->|) 
Deadlock: all threads blocked on internal events
/home/proski/bin/kj: line 13:  3662 Aborted                 (core dumped) kaffe -ms4m -mx32m -classpath /usr/local/share/kaffe/Klasses.jar:/usr/local/hjava/classes:/usr/local/hjava/lib/classes.zip:/usr/local/java/lib/classes.zip:/usr/local/java/classes:/usr/local/hjava/lib -Dhotjava.home=/usr/local/hjava -Djava.home=/usr/local/java -Dwww.home=http://www.kaffe.org/ sunw.hotjava.Main -nosplash