Author: [email protected]
Date: Wed Jun 24 07:57:28 2009
New Revision: 5625
Modified:
releases/1.6/user/super/com/google/gwt/emul/java/sql/Date.java
releases/1.6/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java
Log:
Merging trunk c5616 into releases/1.6
Modified: releases/1.6/user/super/com/google/gwt/emul/java/sql/Date.java
==============================================================================
--- releases/1.6/user/super/com/google/gwt/emul/java/sql/Date.java
(original)
+++ releases/1.6/user/super/com/google/gwt/emul/java/sql/Date.java Wed Jun
24 07:57:28 2009
@@ -28,10 +28,10 @@
try {
// Years are relative to 1900
- int y = Integer.decode(split[0]) - 1900;
+ int y = Integer.parseInt(split[0]) - 1900;
// Months are internally 0-based
- int m = Integer.decode(split[1]) - 1;
- int d = Integer.decode(split[2]);
+ int m = Integer.parseInt(split[1]) - 1;
+ int d = Integer.parseInt(split[2]);
return new Date(y, m, d);
} catch (NumberFormatException e) {
Modified:
releases/1.6/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java
==============================================================================
---
releases/1.6/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java
(original)
+++
releases/1.6/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java
Wed Jun 24 07:57:28 2009
@@ -30,6 +30,7 @@
/**
* Sets module name so that javascript compiler can operate.
*/
+ @Override
public String getModuleName() {
return "com.google.gwt.emultest.EmulSuite";
}
@@ -116,5 +117,18 @@
Date d2 = Date.valueOf(d.toString());
assertEquals(d, d2);
+
+ // validate that leading zero's don't trigger octal eval
+ d = Date.valueOf("2009-08-08");
+ assertEquals(109, d.getYear());
+ assertEquals(7, d.getMonth());
+ assertEquals(8, d.getDate());
+
+ // validate 0x isn't a valid prefix
+ try {
+ d = Date.valueOf("2009-0xA-0xB");
+ fail("Should have thrown IllegalArgumentException");
+ } catch (IllegalArgumentException expected) {
+ }
}
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
