[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: SimpleDateFormat fix

Kaffe CVS cvs-commits at kaffe.org
Sat Jan 15 09:53:31 PST 2005


PatchSet 5859 
Date: 2005/01/15 17:47:53
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: SimpleDateFormat fix

2005-01-15  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-01-13  Sven de Marothy <sven at physto.se>

* java/text/SimpleDateFormat.java
(parse): comparison should be case-insensitive, ignore null strings.

Members: 
	ChangeLog:1.3403->1.3404 
	libraries/javalib/java/text/SimpleDateFormat.java:1.35->1.36 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3403 kaffe/ChangeLog:1.3404
--- kaffe/ChangeLog:1.3403	Sat Jan 15 17:19:49 2005
+++ kaffe/ChangeLog	Sat Jan 15 17:47:53 2005
@@ -1,6 +1,15 @@
 2005-01-15  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
+	
+	2005-01-13  Sven de Marothy <sven at physto.se>
+
+	* java/text/SimpleDateFormat.java
+	(parse): comparison should be case-insensitive, ignore null strings.
+
+2005-01-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
 
 	2005-01-13  Jeroen Frijters  <jeroen at frijters.net>
 
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.35 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.36
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.35	Sun Oct 24 17:20:11 2004
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java	Sat Jan 15 17:47:57 2005
@@ -801,8 +801,10 @@
 	    int i;
 	    for (i = offset; i < match.length; ++i)
 	      {
-		if (dateStr.startsWith(match[i], index))
-		  break;
+		if (match[i] != null)
+		  if (dateStr.toUpperCase().startsWith(match[i].toUpperCase(),
+							index))
+		    break;
 	      }
 	    if (i == match.length)
 	      {




More information about the kaffe mailing list