Synchronized Message's attributes operations as it can cause ConcurrentModificationException sometime.

This commit is contained in:
seb 2011-09-23 08:15:00 +00:00
parent 547c568d9d
commit dce3326061

View File

@ -446,7 +446,8 @@ public abstract class Message
{ {
char length = 0; char length = 0;
for (Attribute att : attributes.values()) List<Attribute> attrs = getAttributes();
for (Attribute att : attrs)
{ {
int attLen = att.getDataLength() + Attribute.HEADER_LENGTH; int attLen = att.getDataLength() + Attribute.HEADER_LENGTH;
@ -468,7 +469,9 @@ public abstract class Message
{ {
char length = 0; char length = 0;
for (Attribute att : attributes.values()) List<Attribute> attrs = getAttributes();
for (Attribute att : attrs)
{ {
int attLen = att.getDataLength() + Attribute.HEADER_LENGTH; int attLen = att.getDataLength() + Attribute.HEADER_LENGTH;
length += attLen; length += attLen;
@ -497,7 +500,10 @@ public abstract class Message
+ getName()); + 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) 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<Attribute> getAttributes() public List<Attribute> getAttributes()
{ {
return new LinkedList<Attribute>(attributes.values()); synchronized(attributes)
{
return new LinkedList<Attribute>(attributes.values());
}
} }
/** /**
@ -546,7 +558,10 @@ public abstract class Message
*/ */
public Attribute removeAttribute(char attributeType) public Attribute removeAttribute(char attributeType)
{ {
return attributes.remove(attributeType); synchronized(attributes)
{
return attributes.remove(attributeType);
}
} }
/** /**