You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/26 08:30:39 UTC
git commit: CAMEL-7538 Fixed the typo with thanks to Claus
Repository: camel
Updated Branches:
refs/heads/master 538a7207d -> eb0d2f8dc
CAMEL-7538 Fixed the typo with thanks to Claus
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eb0d2f8d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb0d2f8d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb0d2f8d
Branch: refs/heads/master
Commit: eb0d2f8dc4065236e911ea824e303a2b494af9f6
Parents: 538a720
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Jun 26 14:30:12 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Jun 26 14:30:12 2014 +0800
----------------------------------------------------------------------
.../camel/component/freemarker/FreemarkerConstants.java | 2 +-
.../camel/component/freemarker/FreemarkerEndpoint.java | 12 ++++++------
.../camel/component/freemarker/FreemarkerTest.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eb0d2f8d/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerConstants.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerConstants.java
index 65d41e2..4ec0899 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerConstants.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerConstants.java
@@ -25,7 +25,7 @@ public final class FreemarkerConstants {
public static final String FREEMARKER_TEMPLATE = "CamelFreemarkerTemplate";
- public static final String FREEMARKER_DATA_MODLE = "CamelFreemarkerDataModle";
+ public static final String FREEMARKER_DATA_MODEL = "CamelFreemarkerDataModel";
private FreemarkerConstants() {
// Utility class
http://git-wip-us.apache.org/repos/asf/camel/blob/eb0d2f8d/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
index c865b2e..7a33922 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
@@ -120,18 +120,18 @@ public class FreemarkerEndpoint extends ResourceEndpoint {
// remove the header to avoid it being propagated in the routing
exchange.getIn().removeHeader(FreemarkerConstants.FREEMARKER_TEMPLATE);
}
- Object dataModle = exchange.getIn().getHeader(FreemarkerConstants.FREEMARKER_DATA_MODLE, Object.class);
- if (dataModle == null) {
- dataModle = ExchangeHelper.createVariableMap(exchange);
+ Object dataModel = exchange.getIn().getHeader(FreemarkerConstants.FREEMARKER_DATA_MODEL, Object.class);
+ if (dataModel == null) {
+ dataModel = ExchangeHelper.createVariableMap(exchange);
}
// let freemarker parse and generate the result in buffer
Template template;
if (reader != null) {
- log.debug("Freemarker is evaluating template read from header {} using context: {}", FreemarkerConstants.FREEMARKER_TEMPLATE, dataModle);
+ log.debug("Freemarker is evaluating template read from header {} using context: {}", FreemarkerConstants.FREEMARKER_TEMPLATE, dataModel);
template = new Template("temp", reader, new Configuration());
} else {
- log.debug("Freemarker is evaluating {} using context: {}", path, dataModle);
+ log.debug("Freemarker is evaluating {} using context: {}", path, dataModel);
if (getEncoding() != null) {
template = configuration.getTemplate(path, getEncoding());
} else {
@@ -139,7 +139,7 @@ public class FreemarkerEndpoint extends ResourceEndpoint {
}
}
StringWriter buffer = new StringWriter();
- template.process(dataModle, buffer);
+ template.process(dataModel, buffer);
buffer.flush();
// now lets output the results to the exchange
http://git-wip-us.apache.org/repos/asf/camel/blob/eb0d2f8d/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
index bce8b6b..a25337b 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
@@ -64,7 +64,7 @@ public class FreemarkerTest extends CamelTestSupport {
variableMap.put("headers", headersMap);
variableMap.put("body", "Monday");
variableMap.put("exchange", exchange);
- exchange.getIn().setHeader(FreemarkerConstants.FREEMARKER_DATA_MODLE, variableMap);
+ exchange.getIn().setHeader(FreemarkerConstants.FREEMARKER_DATA_MODEL, variableMap);
exchange.setProperty("item", "7");
}
});