Commits

Anonymous committed 7d56927

Use Integer.compareTo (duh)

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1970e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 65fba33

Comments (0)

Files changed (2)

File src/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java

             //sort the documents, according to the "order" attribute
             Collections.sort(docs, new Comparator<Document>() {
                 public int compare(Document doc1, Document doc2) {
-                    return XmlHelper.getLoadOrder(doc1) - XmlHelper.getLoadOrder(doc2);
+                    return XmlHelper.getLoadOrder(doc1).compareTo(XmlHelper.getLoadOrder(doc2));
                 }
             });
 

File src/java/com/opensymphony/xwork2/config/providers/XmlHelper.java

     /**
      * Return the value of the "order" attribute from the root element
      */
-     public static int getLoadOrder(Document doc) {
+     public static Integer getLoadOrder(Document doc) {
         Element rootElement = doc.getDocumentElement();
         String number = rootElement.getAttribute("order");
         if (StringUtils.isNotBlank(number)) {