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 2011/10/26 09:28:29 UTC
svn commit: r1189054 - in /camel/branches/camel-2.8.x: ./
components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Author: davsclaus
Date: Wed Oct 26 07:28:28 2011
New Revision: 1189054
URL: http://svn.apache.org/viewvc?rev=1189054&view=rev
Log:
CAMEL-4584: Added option allowStAX to xquery component. Fixed issue with not closing underlying input stream if used.
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 07:28:28 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1189054&r1=1189053&r2=1189054&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/branches/camel-2.8.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Wed Oct 26 07:28:28 2011
@@ -477,13 +477,9 @@ public abstract class XQueryBuilder impl
source = getSource(exchange, body);
}
- // there is a couple of special types we need to check
+ // special for bean invocation
if (source == null) {
- if (body instanceof GenericFile) {
- // special for files so we can work with them out of the box
- is = exchange.getContext().getTypeConverter().convertTo(InputStream.class, body);
- source = converter.toDOMSource(is);
- } else if (body instanceof BeanInvocation) {
+ if (body instanceof BeanInvocation) {
// if its a null bean invocation then handle that
BeanInvocation bi = exchange.getContext().getTypeConverter().convertTo(BeanInvocation.class, body);
if (bi.getArgs() != null && bi.getArgs().length == 1 && bi.getArgs()[0] == null) {