You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/10/31 17:59:43 UTC
svn commit: r590752 - in /activemq/camel/trunk/components/camel-saxon/src:
main/java/org/apache/camel/builder/saxon/XQueryBuilder.java
test/resources/org/apache/camel/component/xquery/transform.xquery
Author: jstrachan
Date: Wed Oct 31 09:59:41 2007
New Revision: 590752
URL: http://svn.apache.org/viewvc?rev=590752&view=rev
Log:
fixed up a failing test case
Modified:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery
Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java?rev=590752&r1=590751&r2=590752&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java Wed Oct 31 09:59:41 2007
@@ -376,20 +376,19 @@
DynamicQueryContext dynamicQueryContext = new DynamicQueryContext(config);
Message in = exchange.getIn();
- Source source = in.getBody(Source.class);
- if (source == null) {
- Item item = in.getBody(Item.class);
- if (item != null) {
- dynamicQueryContext.setContextItem(item);
- }
- else {
+ Item item = in.getBody(Item.class);
+ Source source = null;
+ if (item != null) {
+ dynamicQueryContext.setContextItem(item);
+ }
+ else {
+ source = in.getBody(Source.class);
+ if (source == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("No body available on exchange so using an empty document: " + exchange);
- source = converter.toSource(converter.createDocument());
}
+ source = converter.toSource(converter.createDocument());
}
- }
- if (source != null) {
DocumentInfo doc = getStaticQueryContext().buildDocument(source);
dynamicQueryContext.setContextItem(doc);
}
Modified: activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery?rev=590752&r1=590751&r2=590752&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery Wed Oct 31 09:59:41 2007
@@ -1,3 +1,3 @@
-<transformed subject="{/mail/subject}">
-{/mail}
+<transformed subject="{mail/subject}">
+{.}
</transformed>