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 2012/11/30 10:56:19 UTC

svn commit: r1415566 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java

Author: davsclaus
Date: Fri Nov 30 09:56:19 2012
New Revision: 1415566

URL: http://svn.apache.org/viewvc?rev=1415566&view=rev
Log:
CAMEL-5835: Fixed xpath builder to force layy creating default functions, for thread safety.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1415564
  Merged /camel/branches/camel-2.10.x:r1415565

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1415566&r1=1415565&r2=1415566&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Fri Nov 30 09:56:19 2012
@@ -1007,6 +1007,14 @@ public class XPathBuilder implements Exp
         if (xpathFactory == null) {
             initDefaultXPathFactory();
         }
+
+        // force lazy creating default functions
+        getBodyFunction();
+        getHeaderFunction();
+        getOutBodyFunction();
+        getOutHeaderFunction();
+        getPropertiesFunction();
+        getSimpleFunction();
     }
 
     public void stop() throws Exception {