Fix for synchronization for Dom(#22612)
Signed-off-by: tsyamamoto <tsyamamoto@fujitsu.com>
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
index 68703de..f9fe7d6 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
@@ -328,8 +328,10 @@
public Dom(Dom source, Dom parent) {
this(source.getHabitat(), source.document, parent, source.model);
List<Child> newChildren = new ArrayList<Child>();
- for (Child child : source.children) {
- newChildren.add(child.deepCopy(this));
+ synchronized (source) {
+ for (Child child : source.children) {
+ newChildren.add(child.deepCopy(this));
+ }
}
setChildren(newChildren);
attributes.putAll(source.attributes);
@@ -1270,7 +1272,7 @@
* @param w
* Receives XML infoset stream.
*/
- public synchronized void writeTo(String tagName, XMLStreamWriter w) throws XMLStreamException {
+ public void writeTo(String tagName, XMLStreamWriter w) throws XMLStreamException {
if(tagName==null)
tagName = model.tagName;
if(tagName==null)
@@ -1289,7 +1291,10 @@
w.writeAttribute(attributeToWrite.getKey(), attributeToWrite.getValue());
}
- List<Child> localChildren = new ArrayList<Child>(children);
+ List<Child> localChildren;
+ synchronized(this) {
+ localChildren = new ArrayList<Child>(children);
+ }
for (Child c : localChildren)
c.writeTo(w);
