mpoeschl 2002/11/26 13:27:47
Modified: src/java/org/apache/torque/om DateKey.java StringKey.java
Log:
TRQS82: Constructor for DateKey and StringKey will throw NullPointer
exception if passed null value
Revision Changes Path
1.8 +9 -2
jakarta-turbine-torque/src/java/org/apache/torque/om/DateKey.java
Index: DateKey.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/DateKey.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DateKey.java 26 Jul 2002 22:30:35 -0000 1.7
+++ DateKey.java 26 Nov 2002 21:27:47 -0000 1.8
@@ -96,7 +96,14 @@
*/
public DateKey(DateKey key)
{
- this.key = key.getValue();
+ if( key != null )
+ {
+ this.key = key.getValue();
+ }
+ else
+ {
+ this.key = null;
+ }
}
/**
1.6 +9 -2
jakarta-turbine-torque/src/java/org/apache/torque/om/StringKey.java
Index: StringKey.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/StringKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringKey.java 26 Jul 2002 22:30:35 -0000 1.5
+++ StringKey.java 26 Nov 2002 21:27:47 -0000 1.6
@@ -86,7 +86,14 @@
*/
public StringKey(StringKey key)
{
- this.key = key.getValue();
+ if( key != null )
+ {
+ this.key = key.getValue();
+ }
+ else
+ {
+ this.key = null;
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
