svn commit: r1354835 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl

[sagara]

Author: sagara
Date: Thu Jun 28 07:14:39 2012
New Revision: 1354835

URL: http://svn.apache.org/viewvc?rev=1354835&view=rev
Log:
AXIS2-3744 - Merged r1354834 to 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk:r1354834

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?rev=1354835&r1=1354834&r2=1354835&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
 Thu Jun 28 07:14:39 2012
@@ -402,21 +402,24 @@
 
         try {
         <xsl:for-each select="param[not(@primitive) and @type!='']">
+            <xsl:sort select="@type" order="ascending" data-type="text"/>
+            <xsl:if test="not(@type=preceding-sibling::param/@type)">
                 if (<xsl:value-of select="@type"/>.class.equals(type)){
                 <xsl:choose>
                     <xsl:when test="$helpermode">
-                           return <xsl:value-of 
select="@type"/>Helper.INSTANCE.parse(param.getXMLStreamReaderWithoutCaching());
+                        return <xsl:value-of 
select="@type"/>Helper.INSTANCE.parse(param.getXMLStreamReaderWithoutCaching());
                     </xsl:when>
                     <xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
-                           return param;
+                        return param;
                     </xsl:when>
                     <xsl:otherwise>
-                           return <xsl:value-of 
select="@type"/>.Factory.parse(param.getXMLStreamReaderWithoutCaching());
+                        return <xsl:value-of 
select="@type"/>.Factory.parse(param.getXMLStreamReaderWithoutCaching());
                     </xsl:otherwise>
                 </xsl:choose>
 
                 }
-           </xsl:for-each>
+            </xsl:if>
+        </xsl:for-each>
         } catch (java.lang.Exception e) {
         throw org.apache.axis2.AxisFault.makeFault(e);
         }