henning 2002/08/14 05:06:44
Modified: src/java/org/apache/torque/map TableMap.java
Log:
Clean up the check for setting the primary key method.
Make the check for the method case-insensitive
Revision Changes Path
1.9 +4 -8
jakarta-turbine-torque/src/java/org/apache/torque/map/TableMap.java
Index: TableMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/map/TableMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TableMap.java 7 May 2002 16:51:00 -0000 1.8
+++ TableMap.java 14 Aug 2002 12:06:44 -0000 1.9
@@ -502,20 +502,16 @@
*/
public void setPrimaryKeyMethod(String method)
{
+ primaryKeyMethod = NO_ID_METHOD;
+
// Validate ID generation method.
for (int i = 0; i < VALID_ID_METHODS.length; i++)
{
- if (VALID_ID_METHODS[i].equals(method))
+ if (VALID_ID_METHODS[i].equalsIgnoreCase(method))
{
primaryKeyMethod = method;
break;
}
- }
-
- // Default to no ID generation method.
- if (primaryKeyMethod != method)
- {
- primaryKeyMethod = NO_ID_METHOD;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
