Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

87708: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87650: MNT-12196 : Exception generated in “AccessAuditor” when length of custom property string in Javascript is bigger than 1024 in Postgres database
         - Fixed build failure with 


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

source/java/org/alfresco/repo/audit/AuditComponentImpl.java

@@ -561,8 +561,16 @@ public class AuditComponentImpl implements AuditComponent
                     trimStringsIfNecessary(auditValue);
                 }
             }
+            
+            try
+            {
                 collection.addAll(strings);
             }
+            catch (UnsupportedOperationException e)
+            {
+                // nothing to do in the case of unmodifiable collection
+            }
+        }
     }
     
     @Override

source/test-java/org/alfresco/repo/audit/AuditComponentTest.java

@@ -1005,6 +1005,7 @@ public class AuditComponentTest extends TestCase
                 values.put("/3.1/4.2", mlTextValue);
                 values.put("map", map);
                 values.put("collection", list);
+                values.put("unmodifiableCollection", (Serializable) Collections.unmodifiableCollection(list));
 
                 auditComponent.recordAuditValues("/test/one.one/two.one", values);