2008-12-30 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* java/text/SimpleDateFormat.java:
	(standardChars): Use standard characters from CLDR.
	(RFC822_TIMEZONE_FIELD): Fixed to match new standard
	characters.

2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a285fa3be..8f5787acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-30  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/text/SimpleDateFormat.java:
+	(standardChars): Use standard characters from CLDR.
+	(RFC822_TIMEZONE_FIELD): Fixed to match new standard
+	characters.
+	
 2008-12-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/String.java:
diff --git a/java/text/SimpleDateFormat.java b/java/text/SimpleDateFormat.java
index 4dcda4f48..7d57f67a0 100644
--- a/java/text/SimpleDateFormat.java
+++ b/java/text/SimpleDateFormat.java
@@ -235,8 +235,8 @@ public class SimpleDateFormat extends DateFormat
    */
   private static final long serialVersionUID = 4774881970558875024L;
 
-  // This string is specified in the Java class libraries.
-  private static final String standardChars = "GyMdkHmsSEDFwWahKzZ";
+  // This string is specified in the root of the CLDR.
+  private static final String standardChars = "GyMdkHmsSEDFwWahKzYeugAZvcL";
 
   /**  
    * Represents the position of the RFC822 timezone pattern character
@@ -244,7 +244,7 @@ public class SimpleDateFormat extends DateFormat
    * U.S. locale, this is 'Z'.  The value is the offset of the current
    * time from GMT e.g. -0500 would be five hours prior to GMT.
    */  
-  private static final int RFC822_TIMEZONE_FIELD = 18;
+  private static final int RFC822_TIMEZONE_FIELD = 23;
 
   /**
    * Reads the serialized version of this object.
@@ -576,6 +576,7 @@ public class SimpleDateFormat extends DateFormat
 	    int j = oldChars.indexOf(ch);
 	    if (j >= 0)
 	      ch = newChars.charAt(j);
+
 	  }
 	buf.append(ch);
       }