Fixed #91

Author: cowtowncoder

release-notes/VERSION

@@ -4,6 +4,8 @@ Version: 2.3.2 (xx-xxx-2014)
 #81: Serialization of a polymorphic class As.Property with Identity info doesn't work 
  (fixed by Pascal G)
    -- NOTE! Depends on a related fix in `jackson-databind` 2.3.2
+#91: @JsonPropertyOrder not working correctly with attributes
+ (reported by thrykol@github)
 
 ------------------------------------------------------------------------
 === History: ===

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializer.java

@@ -132,7 +132,6 @@ protected void serializeFields(Object bean, JsonGenerator jgen0, SerializerProvi
 
         final ToXmlGenerator xgen = (ToXmlGenerator) jgen0;
         final BeanPropertyWriter[] props;
-        // !!! TODO: change to use non-deprecated version in 2.3
         if (_filteredProps != null && provider.getActiveView() != null) {
             props = _filteredProps;
         } else {
@@ -195,7 +194,6 @@ protected void serializeFieldsFiltered(Object bean, JsonGenerator jgen0,
         final ToXmlGenerator xgen = (ToXmlGenerator) jgen0;
 
         final BeanPropertyWriter[] props;
-        // !!! TODO: change to use non-deprecated version in 2.3
         if (_filteredProps != null && provider.getActiveView() != null) {
             props = _filteredProps;
         } else {
@@ -315,17 +313,19 @@ protected static int _orderAttributesFirst(BeanPropertyWriter[] properties,
 
         for (int i = 0, len = properties.length; i < len; ++i) {
             BeanPropertyWriter bpw = properties[i];
-            
+
             if (!_isAttribute(bpw)) {
                 continue;
             }
-            // Swap if attribute and there are preceding elements:
-            if (attrCount < i) {
-                properties[i] = properties[attrCount];
+
+            // Move attribute a few places done as necessary
+            int moveBy = i-attrCount;
+            if (moveBy > 0) {
+                System.arraycopy(properties, attrCount, properties, attrCount+1, moveBy);
                 properties[attrCount] = bpw;
                 if (filteredProperties != null) {
                     BeanPropertyWriter fbpw = filteredProperties[i];
-                    filteredProperties[i] = filteredProperties[attrCount];
+                    System.arraycopy(filteredProperties, attrCount, filteredProperties, attrCount+1, moveBy);
                     filteredProperties[attrCount] = fbpw;
                 }
             }