camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1227074 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
Date Wed, 04 Jan 2012 08:24:52 GMT
Author: davsclaus
Date: Wed Jan  4 08:24:52 2012
New Revision: 1227074

URL: http://svn.apache.org/viewvc?rev=1227074&view=rev
Log:
CAMEL-4858: XPathBuilder variable resolver for $ should return empty string if no header to
support both JDK and Saxon XPath Engines.

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

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 08:24:52 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077,1224676,1225137,1225143,1225767
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066,1224674,1225077-1225078,1225766
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077,1224676,1225137,1225143,1225767,1227071
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066,1224674,1225077-1225078,1225766,1227068

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

Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java?rev=1227074&r1=1227073&r2=1227074&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
(original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
Wed Jan  4 08:24:52 2012
@@ -94,10 +94,10 @@ public class MessageVariableResolver imp
             }
         }
 
-        // If we can't find an answer we must return void.
-        // We can't return null then the xpath engine will throw a NullPointerException
+        // if we can't find an answer we must return an empty String.
+        // if we return null, then the JDK default XPathEngine will throw an exception
         if (answer == null) {
-            return Void.class;
+            return "";
         } else {
             return answer;
         }



Mime
View raw message