From 510abf138f54c696cb04f068306cf4591c8df469 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 09:48:27 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20HEAD-BUG-FIX=20(5.1/Cloud)=20to=20HEAD?=
 =?UTF-8?q?=20(5.0/Cloud)=20=20=20=2087708:=20Merged=20V4.2-BUG-FIX=20(4.2?=
 =?UTF-8?q?.4)=20to=20HEAD-BUG-FIX=20(5.0/Cloud)=20=20=20=20=20=20=2087650?=
 =?UTF-8?q?:=20MNT-12196=20:=20Exception=20generated=20in=20=E2=80=9CAcces?=
 =?UTF-8?q?sAuditor=E2=80=9D=20when=20length=20of=20custom=20property=20st?=
 =?UTF-8?q?ring=20in=20Javascript=20is=20bigger=20than=201024=20in=20Postg?=
 =?UTF-8?q?res=20database=20=20=20=20=20=20=20=20=20=20-=20Fixed=20build?=
 =?UTF-8?q?=20failure=20with?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/audit/AuditComponentImpl.java    | 10 +++++++++-
 .../org/alfresco/repo/audit/AuditComponentTest.java    |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
index 85e034d3db..a633026472 100644
--- a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
+++ b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
@@ -561,7 +561,15 @@ public class AuditComponentImpl implements AuditComponent
                     trimStringsIfNecessary(auditValue);
                 }
             }
-            collection.addAll(strings);
+            
+            try
+            {
+                collection.addAll(strings);
+            }
+            catch (UnsupportedOperationException e)
+            {
+                // nothing to do in the case of unmodifiable collection
+            }
         }
     }
     
diff --git a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java b/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java
index 7891ad8ccc..a397e9e1cc 100644
--- a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java
+++ b/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);