You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/08/26 17:17:17 UTC
svn commit: r689107 - in /cxf/branches/2.1.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Author: dkulp
Date: Tue Aug 26 08:17:17 2008
New Revision: 689107
URL: http://svn.apache.org/viewvc?rev=689107&view=rev
Log:
Merged revisions 687914 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r687914 | bimargulies | 2008-08-21 20:33:41 -0400 (Thu, 21 Aug 2008) | 2 lines
Oh, try harder not to make this explode.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 26 08:17:17 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 26 08:17:17 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=689107&r1=689106&r2=689107&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Tue Aug 26 08:17:17 2008
@@ -386,10 +386,18 @@
part.setProperty("nillable", Boolean.valueOf(type.isNillable()));
if (type.hasMinOccurs()) {
- part.setProperty("minOccurs", Long.valueOf(type.getMinOccurs()).toString());
+ long miValue = type.getMinOccurs();
+ if (miValue != 0) {
+ part.setProperty("minOccurs", Long.toString(miValue));
+ }
}
if (type.hasMaxOccurs()) {
- part.setProperty("maxOccurs", Long.valueOf(type.getMaxOccurs()).toString());
+ String moValue;
+ long mo = type.getMaxOccurs();
+ if (mo != Long.MAX_VALUE) {
+ moValue = Long.toString(mo);
+ part.setProperty("maxOccurs", moValue);
+ }
}
part2Type.put(part, type);