[kaffe] CVS kaffe (robilad): Resynced with gnu claspath: uri fix

[Kaffe CVS]

PatchSet 6546 
Date: 2005/05/18 21:34:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gnu claspath: uri fix

2005-05-18  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-05-16  Tom Tromey  <tromey at redhat.com>

        * java/net/URI.java (unquote): Handle lower-case letters as well.

Members: 
	ChangeLog:1.4072->1.4073 
	libraries/javalib/java/net/URI.java:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4072 kaffe/ChangeLog:1.4073
--- kaffe/ChangeLog:1.4072	Wed May 18 21:23:04 2005
+++ kaffe/ChangeLog	Wed May 18 21:34:06 2005
@@ -4,6 +4,14 @@
 
 	2005-05-16  Tom Tromey  <tromey at redhat.com>
 
+        * java/net/URI.java (unquote): Handle lower-case letters as well.
+
+2005-05-18  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-05-16  Tom Tromey  <tromey at redhat.com>
+
         * java/nio/charset/Charset.java (encode, decode): Synchronize on
         'this', not the class.
 
Index: kaffe/libraries/javalib/java/net/URI.java
diff -u kaffe/libraries/javalib/java/net/URI.java:1.13 kaffe/libraries/javalib/java/net/URI.java:1.14
--- kaffe/libraries/javalib/java/net/URI.java:1.13	Fri Apr 22 22:43:31 2005
+++ kaffe/libraries/javalib/java/net/URI.java	Wed May 18 21:34:09 2005
@@ -313,9 +313,8 @@
 	  {
 	    if (i + 2 >= str.length())
 	      throw new URISyntaxException(str, "Invalid quoted character");
-	    String hex = "0123456789ABCDEF";
-	    int hi = hex.indexOf(str.charAt(++i));
-	    int lo = hex.indexOf(str.charAt(++i));
+	    int hi = Character.digit(str.charAt(++i), 16);
+	    int lo = Character.digit(str.charAt(++i), 16);
 	    if (lo < 0 || hi < 0)
 	      throw new URISyntaxException(str, "Invalid quoted character");
 	    buf[pos++] = (byte) (hi * 16 + lo);