Merged V3.2 to HEAD

18021: AVM - fix AVMNodeService.getChildByName
    18065: (record-only) 
    18254: WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
    18442: ETHREEOH-4004 - rework test
    18467: ETHTREEOH-4004 - test fix (avoid conversion, replace UTF-16 with UTF-8)
    18835: (record-only) Merged V3.1 to V3.2 (record-only)
        18783: (record-only) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) - fixed by r14588
    19146: (record-only) Undo previous/unwanted commit (version.properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java

@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import org.alfresco.repo.avm.util.AVMUtil;
 import org.alfresco.repo.domain.DbAccessControlList;
@@ -410,6 +411,9 @@ public class AVMSyncServiceImpl implements AVMSyncService
         
         Map<String, Integer> storeVersions = new HashMap<String, Integer>();
         Set<String> destStores = new HashSet<String>();
+        
+        Map<String, AVMDifference> diffsToUpdate = new TreeMap<String, AVMDifference>();
+        
         for (AVMDifference diff : diffList)
         {
             if (excluder != null && (excluder.matches(diff.getSourcePath()) ||
@@ -417,10 +421,17 @@ public class AVMSyncServiceImpl implements AVMSyncService
             {
                 continue;
             }
+            
             if (!diff.isValid())
             {
                 throw new AVMSyncException("Malformed AVMDifference.");
             }
+            
+            diffsToUpdate.put(diff.getSourcePath(), diff);
+        }
+        
+        for (AVMDifference diff : diffsToUpdate.values())
+        {
             if (logger.isDebugEnabled())
             {
                 logger.debug("update: " + diff);