[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: userInfo fixes for URLs

[Kaffe CVS]

PatchSet 5225 
Date: 2004/09/28 15:42:59
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: userInfo fixes for URLs

2004-09-28  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/net/URL.java:
        Resynced with GNU Classpath.

        2004-09-24  David Daney  <ddaney at avtrex.com>

        * java/net/URL.java (URL): Copy userInfo from context.
        (getUserInfo): Return cached userInfo if present.

Members: 
	ChangeLog:1.2779->1.2780 
	libraries/javalib/java/net/URL.java:1.46->1.47 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2779 kaffe/ChangeLog:1.2780
--- kaffe/ChangeLog:1.2779	Mon Sep 27 17:40:54 2004
+++ kaffe/ChangeLog	Tue Sep 28 15:42:59 2004
@@ -1,3 +1,13 @@
+2004-09-28  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/java/net/URL.java:
+	Resynced with GNU Classpath.
+	
+	2004-09-24  David Daney  <ddaney at avtrex.com>
+
+	* java/net/URL.java (URL): Copy userInfo from context.
+	(getUserInfo): Return cached userInfo if present.
+	
 2004-09-26  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
Index: kaffe/libraries/javalib/java/net/URL.java
diff -u kaffe/libraries/javalib/java/net/URL.java:1.46 kaffe/libraries/javalib/java/net/URL.java:1.47
--- kaffe/libraries/javalib/java/net/URL.java:1.46	Sat Aug 14 16:59:52 2004
+++ kaffe/libraries/javalib/java/net/URL.java	Tue Sep 28 15:43:03 2004
@@ -407,6 +407,7 @@
 	    host = context.host;
 	    port = context.port;
 	    file = context.file;
+            userInfo = context.userInfo;
 	    if (file == null || file.length() == 0)
 	      file = "/";
 	    authority = context.authority;
@@ -421,6 +422,7 @@
 	host = context.host;
 	port = context.port;
 	file = context.file;
+        userInfo = context.userInfo;
 	if (file == null || file.length() == 0)
 	  file = "/";
 	authority = context.authority;
@@ -622,6 +624,8 @@
    */
   public String getUserInfo()
   {
+    if (userInfo != null)
+      return userInfo;
     int at = (host == null) ? -1 : host.indexOf('@');
     return at < 0 ? null : host.substring(0, at);
   }