From dce332606157ced64c425628b41ea5eca8e3a428 Mon Sep 17 00:00:00 2001 From: seb Date: Fri, 23 Sep 2011 08:15:00 +0000 Subject: [PATCH] Synchronized Message's attributes operations as it can cause ConcurrentModificationException sometime. --- src/org/ice4j/message/Message.java | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/org/ice4j/message/Message.java b/src/org/ice4j/message/Message.java index d2bd8a1..f06085b 100644 --- a/src/org/ice4j/message/Message.java +++ b/src/org/ice4j/message/Message.java @@ -446,7 +446,8 @@ public abstract class Message { char length = 0; - for (Attribute att : attributes.values()) + List attrs = getAttributes(); + for (Attribute att : attrs) { int attLen = att.getDataLength() + Attribute.HEADER_LENGTH; @@ -468,7 +469,9 @@ public abstract class Message { char length = 0; - for (Attribute att : attributes.values()) + List attrs = getAttributes(); + + for (Attribute att : attrs) { int attLen = att.getDataLength() + Attribute.HEADER_LENGTH; length += attLen; @@ -497,7 +500,10 @@ public abstract class Message + getName()); } - attributes.put(attribute.getAttributeType(), attribute); + synchronized(attributes) + { + attributes.put(attribute.getAttributeType(), attribute); + } } /** @@ -524,7 +530,10 @@ public abstract class Message */ public Attribute getAttribute(char attributeType) { - return attributes.get(attributeType); + synchronized(attributes) + { + return attributes.get(attributeType); + } } /** @@ -534,7 +543,10 @@ public abstract class Message */ public List getAttributes() { - return new LinkedList(attributes.values()); + synchronized(attributes) + { + return new LinkedList(attributes.values()); + } } /** @@ -546,7 +558,10 @@ public abstract class Message */ public Attribute removeAttribute(char attributeType) { - return attributes.remove(attributeType); + synchronized(attributes) + { + return attributes.remove(attributeType); + } } /**