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 2015/06/05 08:24:20 UTC
[3/5] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9e105bb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9e105bb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9e105bb
Branch: refs/heads/master
Commit: c9e105bb047a57d7995ebb0b8d6cca7bb0f0b775
Parents: 8106485
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jun 5 08:28:12 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jun 5 08:28:12 2015 +0200
----------------------------------------------------------------------
.../apache/camel/component/mybatis/MyBatisProducer.java | 11 ++++++-----
...yBatisSelectOneExchangeInOutWithOutputHeaderTest.java | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c9e105bb/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 63a1e89..9eb435c 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -228,13 +228,14 @@ public class MyBatisProducer extends DefaultProducer {
private void doProcessResult(Exchange exchange, Object result, SqlSession session) {
final String outputHeader = getEndpoint().getOutputHeader();
Message answer = exchange.getIn();
+
if (ExchangeHelper.isOutCapable(exchange)) {
answer = exchange.getOut();
// preserve headers
answer.getHeaders().putAll(exchange.getIn().getHeaders());
if (outputHeader != null) {
- //if we put the MyBatis result into a header we should preserve the body as well
- answer.setBody(exchange.getIn().getBody());
+ //if we put the MyBatis result into a header we should preserve the body as well
+ answer.setBody(exchange.getIn().getBody());
}
}
if (endpoint.getStatementType() == StatementType.SelectList || endpoint.getStatementType() == StatementType.SelectOne) {
@@ -269,8 +270,8 @@ public class MyBatisProducer extends DefaultProducer {
}
} else {
- final String headerName = (outputHeader != null) ? outputHeader : MyBatisConstants.MYBATIS_RESULT;
- answer.setHeader(headerName, result);
+ final String headerName = (outputHeader != null) ? outputHeader : MyBatisConstants.MYBATIS_RESULT;
+ answer.setHeader(headerName, result);
}
answer.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME, statement);
}
@@ -288,5 +289,5 @@ public class MyBatisProducer extends DefaultProducer {
return exchange.getIn().getBody();
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c9e105bb/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
index d646d43..fb6a521 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
@@ -49,7 +49,7 @@ public class MyBatisSelectOneExchangeInOutWithOutputHeaderTest extends MyBatisTe
public void configure() throws Exception {
// START SNIPPET: e1
from("direct:start")
- .setExchangePattern(ExchangePattern.InOut)
+ .setExchangePattern(ExchangePattern.InOut)
.to("mybatis:selectAccountById?statementType=SelectOne&outputHeader=" + TEST_CASE_HEADER_NAME)
.to("mock:result");
// END SNIPPET: e1