You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/02/18 23:23:21 UTC

svn commit: r1660747 - /sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java

Author: rombert
Date: Wed Feb 18 22:23:21 2015
New Revision: 1660747

URL: http://svn.apache.org/r1660747
Log:
SLING-3781 - Fix unstable Eclipse-based tests

Ensure consistent ordering of properties in
SimpleXmlSerializationManager ( exposed by test failure on Java 8 )

Modified:
    sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java

Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java?rev=1660747&r1=1660746&r2=1660747&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java Wed Feb 18 22:23:21 2015
@@ -22,6 +22,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -133,7 +136,8 @@ public class SimpleXmlSerializationManag
             handler.setResult(sr);
             handler.startDocument();
             startElement(handler, TAG_RESOURCE);
-            for (Map.Entry<String, Object> property : content.entrySet()) {
+            Set<Entry<String, Object>> entrySet = new TreeMap<String, Object>(content).entrySet();
+            for (Map.Entry<String, Object> property : entrySet) {
                 Object value = property.getValue();
                 if (value instanceof String) {
                     String tagName = property.getKey();