seade 2004/03/11 17:34:47
Modified: src/java/org/apache/turbine/services/intake/model
IntegerField.java FloatField.java LongField.java
DoubleField.java ShortField.java BooleanField.java
Log:
Fix how Intake handles empty multiValued entries for primitive types.
Revision Changes Path
1.15 +9 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IntegerField.java 5 Mar 2004 05:33:50 -0000 1.14
+++ IntegerField.java 12 Mar 2004 01:34:47 -0000 1.15
@@ -131,7 +131,15 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? new Integer(0) : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new int[0];
+ }
+ else
+ {
+ return (null == getEmptyValue())
+ ? new Integer(0) : getEmptyValue();
+ }
}
/**
1.14 +10 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java
Index: FloatField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FloatField.java 5 Mar 2004 05:33:50 -0000 1.13
+++ FloatField.java 12 Mar 2004 01:34:47 -0000 1.14
@@ -132,7 +132,15 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? new Float(0.0) : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new float[0];
+ }
+ else
+ {
+ return (null == getEmptyValue())
+ ? new Float(0.0) : getEmptyValue();
+ }
}
/**
1.7 +9 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/LongField.java
Index: LongField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/LongField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LongField.java 14 Oct 2003 12:17:24 -0000 1.6
+++ LongField.java 12 Mar 2004 01:34:47 -0000 1.7
@@ -135,7 +135,14 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? new Long(0l) : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new long[0];
+ }
+ else
+ {
+ return (null == getEmptyValue()) ? new Long(0l) : getEmptyValue();
+ }
}
/**
1.12 +10 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java
Index: DoubleField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DoubleField.java 5 Mar 2004 05:33:50 -0000 1.11
+++ DoubleField.java 12 Mar 2004 01:34:47 -0000 1.12
@@ -131,7 +131,15 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? new Double(0.0) : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new double[0];
+ }
+ else
+ {
+ return (null == getEmptyValue())
+ ? new Double(0.0) : getEmptyValue();
+ }
}
/**
1.8 +10 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ShortField.java
Index: ShortField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ShortField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ShortField.java 5 Mar 2004 05:33:50 -0000 1.7
+++ ShortField.java 12 Mar 2004 01:34:47 -0000 1.8
@@ -132,8 +132,15 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue())
- ? new Short((short) 0) : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new short[0];
+ }
+ else
+ {
+ return (null == getEmptyValue())
+ ? new Short((short) 0) : getEmptyValue();
+ }
}
/**
1.17 +9 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BooleanField.java 5 Mar 2004 05:33:50 -0000 1.16
+++ BooleanField.java 12 Mar 2004 01:34:47 -0000 1.17
@@ -125,7 +125,14 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? Boolean.FALSE : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new boolean[0];
+ }
+ else
+ {
+ return (null == getEmptyValue()) ? Boolean.FALSE : getEmptyValue();
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
