jmcnally 2002/08/29 19:07:39
Modified: src/templates/om ObjectWithManager.vm Object.vm
Log:
avoid npe and set id to null if the object was null
Revision Changes Path
1.25 +8 -1 jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ObjectWithManager.vm 29 Aug 2002 04:59:32 -0000 1.24
+++ ObjectWithManager.vm 30 Aug 2002 02:07:39 -0000 1.25
@@ -286,7 +286,14 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.LocalForeignMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- set${column.JavaName}(v.get${colFK.JavaName}());
+ if (v == null)
+ {
+ set${column.JavaName}(($column.JavaNative)null);
+ }
+ else
+ {
+ set${column.JavaName}(v.get${colFK.JavaName}());
+ }
#end
$varName = v;
}
1.47 +9 -2 jakarta-turbine-torque/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Object.vm 29 Aug 2002 04:59:32 -0000 1.46
+++ Object.vm 30 Aug 2002 02:07:39 -0000 1.47
@@ -287,8 +287,15 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.LocalForeignMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- set${column.JavaName}(v.get${colFK.JavaName}());
- #end
+ if (v == null)
+ {
+ set${column.JavaName}(($column.JavaNative)null);
+ }
+ else
+ {
+ set${column.JavaName}(v.get${colFK.JavaName}());
+ }
+ #end
$varName = v;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
