WSDL2C: WSDL Choice element not handled

This problem is fixed in the trunk of Axis2, but the fix needs to be made on the Axis2 1.1.1 branch as well.

WSDL:

<complexType name="NameValue">
<sequence>
<element name="name" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
<choice>
<element name="value" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
<element name="values" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
</choice>
</sequence>
</complexType>

Code Gen options:
org.apache.axis2.wsdl.WSDL2C -f -uri test.wsdl -o server10 -d adb -ss -sd

Resulting Code, Only the name part is generated:

struct axis2_NameValue_impl

{ axis2_NameValue_t NameValue; axis2_char_t* attrib_name; }

;