Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fa00d30 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fa00d30 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fa00d30 Branch: refs/heads/master Commit: 0fa00d30d0ec7c0ada6d7c661ac6e1263030c57a Parents: ad77413 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jun 24 08:11:02 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jun 24 08:11:02 2015 +0200 ---------------------------------------------------------------------- .../apache/camel/component/dozer/ExpressionMapper.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0fa00d30/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java ---------------------------------------------------------------------- diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java index 007cc97..9a6ec17 100644 --- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java +++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java @@ -22,8 +22,8 @@ import java.io.InputStream; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.spi.Language; -import org.apache.camel.util.ResourceHelper; import org.apache.camel.util.IOHelper; +import org.apache.camel.util.ResourceHelper; /** * Provides support for mapping a Camel expression to a target field in a @@ -46,15 +46,14 @@ public class ExpressionMapper extends BaseConverter { throw new IllegalStateException( "Current exchange has not been set for ExpressionMapper"); } + + Expression exp; + // Resolve the language being used for this expression and evaluate Exchange exchange = currentExchange.get(); Language expLang = exchange.getContext().resolveLanguage(getLanguagePart()); String scheme = getSchemePart(); - Expression exp = null; - if (scheme != null && - (scheme.equalsIgnoreCase("classpath") || - scheme.equalsIgnoreCase("file") || - scheme.equalsIgnoreCase("http"))) { + if (scheme != null && (scheme.equalsIgnoreCase("classpath") || scheme.equalsIgnoreCase("file") || scheme.equalsIgnoreCase("http"))) { String path = getPathPart(); try { exp = expLang.createExpression(resolveScript(scheme + ":" + path));
