From 0a489d37043bff66d57b1712c013e72e452e7c39 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 25 Feb 2013 09:53:06 +0000
Subject: [PATCH] OPENDJ-390 (CR-1319) ConcurrentModificationException during backup all 

---
 opends/src/server/org/opends/server/types/Entry.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/types/Entry.java b/opends/src/server/org/opends/server/types/Entry.java
index 9fe5631..2b51f22 100644
--- a/opends/src/server/org/opends/server/types/Entry.java
+++ b/opends/src/server/org/opends/server/types/Entry.java
@@ -2945,16 +2945,19 @@
     deepCopy(operationalAttributes, operationalAttrsCopy, false,
         false, false, true, false);
 
+    // Put back all the suppressed attributes where they belonged to.
+    // Then hopefully processVirtualAttributes() will rebuild the suppressed
+    // attribute list correctly.
     for (AttributeType t : suppressedAttributes.keySet())
     {
       List<Attribute> attrList = suppressedAttributes.get(t);
       if (t.isOperational())
       {
-        operationalAttributes.put(t, attrList);
+        operationalAttrsCopy.put(t, attrList);
       }
       else
       {
-        userAttributes.put(t, attrList);
+        userAttrsCopy.put(t, attrList);
       }
     }
 

--
Gitblit v1.10.0