Author: davsclaus
Date: Fri Nov 7 05:22:49 2008
New Revision: 712122
URL: http://svn.apache.org/viewvc?rev=712122&view=rev
Log:
Merged revisions 712119 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r712119 | davsclaus | 2008-11-07 14:11:11 +0100 (fr, 07 nov 2008) | 1 line
CAMEL-1057: out should only be set on query context if out != null. Applied
patch with thanks to Balazs.
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 7 05:22:49 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 7 05:22:49 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119
Modified:
activemq/camel/branches/camel-1.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=712122&r1=712121&r2=712122&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Fri Nov 7 05:22:49 2008
@@ -423,8 +423,9 @@
addParameters(dynamicQueryContext, getParameters());
dynamicQueryContext.setParameter("exchange", exchange);
- if (exchange.getPattern().isOutCapable()) {
- dynamicQueryContext.setParameter("out", exchange.getOut());
+ Message out = exchange.getOut(false);
+ if (out != null && exchange.getPattern().isOutCapable()) {
+ dynamicQueryContext.setParameter("out", out);
}
}
