Author: seade
Date: Tue Feb 9 12:30:28 2010
New Revision: 908012
URL: http://svn.apache.org/viewvc?rev=908012&view=rev
Log:
Deal with situation arising in jre1.6.0_18 where an IllegalArgumentException is
encountered for dates with a single digit month or day of month. Resolves
TORQUE-133.
Modified:
db/torque/village/tags/TORQUE_3_3/pom.xml
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml
Modified: db/torque/village/tags/TORQUE_3_3/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/pom.xml?rev=908012&r1=908011&r2=908012&view=diff
==============================================================================
--- db/torque/village/tags/TORQUE_3_3/pom.xml (original)
+++ db/torque/village/tags/TORQUE_3_3/pom.xml Tue Feb 9 12:30:28 2010
@@ -26,6 +26,7 @@
<artifactId>torque</artifactId>
<version>3.3</version>
</parent>
+ <version>3.3.1-dev</version>
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +40,7 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified:
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java?rev=908012&r1=908011&r2=908012&view=diff
==============================================================================
---
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
(original)
+++
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
Tue Feb 9 12:30:28 2010
@@ -1245,17 +1245,17 @@
{
cal.setTime((Time) valueObject);
- return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-" +
- (cal.get(Calendar.MONTH) + 1) + "-"
- + cal.get(Calendar.DAY_OF_MONTH));
+ return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-"
+ + leadingZero(cal.get(Calendar.MONTH) + 1) + "-"
+ + leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
- return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-" +
- (cal.get(Calendar.MONTH) + 1) + "-"
- + cal.get(Calendar.DAY_OF_MONTH));
+ return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-"
+ + leadingZero(cal.get(Calendar.MONTH) + 1) + "-"
+ + leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isString())
{
@@ -1312,17 +1312,17 @@
{
cal.setTime((Time) valueObject);
- return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-" +
- (cal.get(Calendar.MONTH) + 1) + "-"
- + cal.get(Calendar.DAY_OF_MONTH));
+ return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-"
+ + leadingZero(cal.get(Calendar.MONTH) + 1) + "-"
+ + leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
- return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-" +
- (cal.get(Calendar.MONTH) + 1) + "-"
- + cal.get(Calendar.DAY_OF_MONTH));
+ return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + "-"
+ + leadingZero(cal.get(Calendar.MONTH) + 1) + "-"
+ + leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else
{
@@ -1523,4 +1523,15 @@
|| value.equalsIgnoreCase("yes")
|| value.equalsIgnoreCase("y") || value.equals("1"));
}
+
+ /**
+ * Convert an int to a two digit String with a leading zero where
necessary.
+ *
+ * @param val The value to be converted.
+ * @return A two character String with leading zero.
+ */
+ private String leadingZero(int val)
+ {
+ return (val < 10 ? "0" : "") + val;
+ }
}
Modified: db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml?rev=908012&r1=908011&r2=908012&view=diff
==============================================================================
--- db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml (original)
+++ db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml Tue Feb 9 12:30:28 2010
@@ -24,7 +24,14 @@
</properties>
<body>
- <release version="3.3" date="in SVN">
+ <release version="3.3.1" date="in SVN">
+ <action type="fix" dev="seade" issue="TORQUE-133" due-to="Georg Marx">
+ Deal with situation arising in jre1.6.0_18 where an
+ IllegalArgumentException is encountered for dates with a single digit
+ month or day of month.
+ </action>
+ </release>
+ <release version="3.3" date="2008-02-29">
<action type="update" dev="seade">
Refactored unit tests to use JUnit. Added test case for TORQUE-8.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
