[jbossws-commits] JBossWS SVN: r12007 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema.

Author: richard.opalka(a)jboss.com Date: 2010-04-16 03:56:06 -0400 (Fri, 16 Apr 2010) New Revision: 12007 Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java Log: [JBPAPP-4098] fixing wrong compareTo method assumptions Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2010-04-16 07:54:27 UTC (rev 12006) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2010-04-16 07:56:06 UTC (rev 12007) @@ -117,10 +117,14 @@ JBossXSParticle w = (JBossXSParticle)o; String oname = w.getTerm().getName(); String termName = term.getName(); - if (termName != null) + if (termName != null && oname != null) c = termName.compareTo(oname); + else if (termName == null) + c = -1; + else + c = 1; //In the case of doclit, need to be careful about String_1,SimpleType_2 - if (termName != null) + if (termName != null && oname != null) { char num1 = termName.charAt(termName.length() - 1); char num2 = oname.charAt(oname.length() - 1);