You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2004/03/12 02:41:15 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model BooleanField.java DoubleField.java LongField.java FloatField.java ShortField.java IntegerField.java
seade 2004/03/11 17:41:15
Modified: src/java/org/apache/turbine/services/intake/model Tag:
TURBINE_2_3_BRANCH BooleanField.java
DoubleField.java LongField.java FloatField.java
ShortField.java IntegerField.java
Log:
Fix how Intake handles empty multiValued entries for primitive types.
Revision Changes Path
No revision
No revision
1.12.2.5 +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.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- BooleanField.java 5 Mar 2004 04:22:11 -0000 1.12.2.4
+++ BooleanField.java 12 Mar 2004 01:41:15 -0000 1.12.2.5
@@ -86,7 +86,14 @@
*/
protected Object getSafeEmptyValue()
{
- return (null == getEmptyValue()) ? Boolean.FALSE : getEmptyValue();
+ if (isMultiValued)
+ {
+ return new boolean[0];
+ }
+ else
+ {
+ return (null == getEmptyValue()) ? Boolean.FALSE : getEmptyValue();
+ }
}
/**
1.7.2.5 +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.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- DoubleField.java 5 Mar 2004 04:22:11 -0000 1.7.2.4
+++ DoubleField.java 12 Mar 2004 01:41:15 -0000 1.7.2.5
@@ -92,7 +92,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.3.2.5 +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.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- LongField.java 5 Mar 2004 04:22:11 -0000 1.3.2.4
+++ LongField.java 12 Mar 2004 01:41:15 -0000 1.3.2.5
@@ -93,7 +93,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.9.2.5 +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.9.2.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- FloatField.java 5 Mar 2004 04:22:11 -0000 1.9.2.4
+++ FloatField.java 12 Mar 2004 01:41:15 -0000 1.9.2.5
@@ -93,7 +93,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.3.2.5 +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.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- ShortField.java 5 Mar 2004 04:22:11 -0000 1.3.2.4
+++ ShortField.java 12 Mar 2004 01:41:15 -0000 1.3.2.5
@@ -92,8 +92,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.10.2.5 +10 -2 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.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- IntegerField.java 5 Mar 2004 04:22:11 -0000 1.10.2.4
+++ IntegerField.java 12 Mar 2004 01:41:15 -0000 1.10.2.5
@@ -93,7 +93,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();
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org