You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/05/12 09:00:06 UTC

svn commit: r943394 - /camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java

Author: davsclaus
Date: Wed May 12 07:00:06 2010
New Revision: 943394

URL: http://svn.apache.org/viewvc?rev=943394&view=rev
Log:
CAMEL-2692: Fixed concurrency issue with Node to DOM convertion.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=943394&r1=943393&r2=943394&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Wed May 12 07:00:06 2010
@@ -571,9 +571,9 @@ public class XmlConverter {
                 // else, create a new doc and copy the element inside it
             } else {
                 Document doc = createDocument();
-                // import node must no occur concurrent on the same node
+                // import node must no occur concurrent on the same node (must be its owner)
                 // so we need to synchronize on it
-                synchronized (node) {
+                synchronized (node.getOwnerDocument()) {
                     doc.appendChild(doc.importNode(node, true));
                 }
                 return doc;