mkalen 2005/03/02 12:24:12
Modified: src/test/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
FieldConversionTest_4.java
Log:
Make inner conversion class null-safe to prevent errors when referencing data
from PB-tests.
Revision Changes Path
No revision
No revision
1.1.2.1 +11 -3
db-ojb/src/test/org/apache/ojb/odmg/FieldConversionTest_4.java
Index: FieldConversionTest_4.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/odmg/FieldConversionTest_4.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- FieldConversionTest_4.java 22 Jun 2004 18:16:22 -0000 1.1
+++ FieldConversionTest_4.java 2 Mar 2005 20:24:12 -0000 1.1.2.1
@@ -127,7 +127,11 @@
public Object javaToSql(Object source) throws ConversionException
{
Object ret;
- if (source instanceof Long)
+ if (source == null)
+ {
+ ret = null;
+ }
+ else if (source instanceof Long)
{
ret = new BigDecimal(((Long) source).doubleValue());
}
@@ -143,7 +147,11 @@
public Object sqlToJava(Object source) throws ConversionException
{
Object ret;
- if (source instanceof BigDecimal)
+ if (source == null)
+ {
+ ret = null;
+ }
+ else if (source instanceof BigDecimal)
{
ret = new Long(((BigDecimal) source).longValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
