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

[Kaffe CVS]

PatchSet 5507 
Date: 2005/03/09 11:47:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: URI fixlet

2005-03-09  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-03-07  Jeroen Frijters  <jeroen at frijters.net>

        * java/net/URI.java (AUTHORITY_REGEXP): Corrected regexp.
        (AUTHORITY_USERINFO_GROUP,AUTHORITY_HOST_GROUP,AUTHORITY_PORT_GROUP):
        Adjusted to match new regexp.

Members: 
	ChangeLog:1.3681->1.3682 
	libraries/javalib/java/net/URI.java:1.11->1.12 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3681 kaffe/ChangeLog:1.3682
--- kaffe/ChangeLog:1.3681	Wed Mar  9 10:36:41 2005
+++ kaffe/ChangeLog	Wed Mar  9 11:47:00 2005
@@ -4,6 +4,16 @@
 
 	2005-03-07  Jeroen Frijters  <jeroen at frijters.net>
 
+        * java/net/URI.java (AUTHORITY_REGEXP): Corrected regexp.
+        (AUTHORITY_USERINFO_GROUP,AUTHORITY_HOST_GROUP,AUTHORITY_PORT_GROUP):
+        Adjusted to match new regexp.
+
+2005-03-09  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-03-07  Jeroen Frijters  <jeroen at frijters.net>
+
         * java/io/DataInputStream.java (ignoreInitialNewline): Removed
         (readLine): Changed newline handling.
 
Index: kaffe/libraries/javalib/java/net/URI.java
diff -u kaffe/libraries/javalib/java/net/URI.java:1.11 kaffe/libraries/javalib/java/net/URI.java:1.12
--- kaffe/libraries/javalib/java/net/URI.java:1.11	Sun Feb 13 22:11:17 2005
+++ kaffe/libraries/javalib/java/net/URI.java	Wed Mar  9 11:47:03 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 = 3;
-  private static final int AUTHORITY_HOST_GROUP = 4;
-  private static final int AUTHORITY_PORT_GROUP = 6;
+  private static final int AUTHORITY_USERINFO_GROUP = 2;
+  private static final int AUTHORITY_HOST_GROUP = 3;
+  private static final int AUTHORITY_PORT_GROUP = 5;
   
   private transient String scheme;
   private transient String rawSchemeSpecificPart;