[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: URI fixes

[Kaffe CVS]

PatchSet 5525 
Date: 2005/02/13 22:11:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: URI fixes

2005-02-13  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-08  Tom Tromey  <tromey at redhat.com>

        * java/net/URI.java (AUTHORITY_REGEXP): Handle case where user
        name or port is missing.
        (AUTHORITY_USERINFO_GROUP, AUTHORITY_HOST_GROUP,
        AUTHORITY_PORT_GROUP): Updated.

Members: 
	ChangeLog:1.3569->1.3570 
	libraries/javalib/java/net/URI.java:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3569 kaffe/ChangeLog:1.3570
--- kaffe/ChangeLog:1.3569	Sun Feb 13 22:01:25 2005
+++ kaffe/ChangeLog	Sun Feb 13 22:11:08 2005
@@ -2,6 +2,17 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-08  Tom Tromey  <tromey at redhat.com>
+
+        * java/net/URI.java (AUTHORITY_REGEXP): Handle case where user
+        name or port is missing.
+        (AUTHORITY_USERINFO_GROUP, AUTHORITY_HOST_GROUP,
+        AUTHORITY_PORT_GROUP): Updated.
+
+2005-02-13  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-08  Craig Black  <craig.black at aonix.com>
 
         * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
Index: kaffe/libraries/javalib/java/net/URI.java
diff -u kaffe/libraries/javalib/java/net/URI.java:1.10 kaffe/libraries/javalib/java/net/URI.java:1.11
--- kaffe/libraries/javalib/java/net/URI.java:1.10	Tue Jan 18 15:18:49 2005
+++ kaffe/libraries/javalib/java/net/URI.java	Sun Feb 13 22:11:17 2005
@@ -65,7 +65,7 @@
     "^(([^:/?#]+):)?((//([^/?#]*))?([^?#]*)(\\?([^#]*))?)?(#(.*))?";
 
   private static final String AUTHORITY_REGEXP =
-    "^(([^?#]*)@([^?#]*):([^?#]*))?";
+    "^((([^?#]*)@)?([^?#:]*)(:([^?#]*)))?";
 
   /**
    * Valid characters (taken from rfc2396)
@@ -115,9 +115,9 @@
    */
   private static final int FRAGMENT_GROUP = 10;
   
-  private static final int AUTHORITY_USERINFO_GROUP = 2;
-  private static final int AUTHORITY_HOST_GROUP = 3;
-  private static final int AUTHORITY_PORT_GROUP = 4;
+  private static final int AUTHORITY_USERINFO_GROUP = 3;
+  private static final int AUTHORITY_HOST_GROUP = 4;
+  private static final int AUTHORITY_PORT_GROUP = 6;
   
   private transient String scheme;
   private transient String rawSchemeSpecificPart;