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 2014/01/10 10:29:54 UTC
[1/3] git commit: CAMEL-7120: Fixed potential NPE due copy/paste
mistake. Thanks to Josh Reagan for reporting.
Updated Branches:
refs/heads/camel-2.11.x c6de749e9 -> 570ec9ae7
refs/heads/camel-2.12.x 136d7c3e4 -> 642a1d695
refs/heads/master f80dc9f70 -> a0ee918f3
CAMEL-7120: Fixed potential NPE due copy/paste mistake. Thanks to Josh Reagan for reporting.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0ee918f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0ee918f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0ee918f
Branch: refs/heads/master
Commit: a0ee918f3bd11f271c09c15a55e40bfe6edc0aaa
Parents: f80dc9f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 10 10:32:34 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 10 10:32:34 2014 +0100
----------------------------------------------------------------------
.../camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a0ee918f/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index afb0c96..180b982 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -103,7 +103,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
// add the footer if it is in the exchange header
Map<String, Object> footerRow = (Map<String, Object>) exchange.getIn().getHeader(CAMEL_BINDY_FIXED_LENGTH_FOOTER);
- if (headerRow != null) {
+ if (footerRow != null) {
models.add(models.size(), footerRow);
}
[2/3] git commit: CAMEL-7120: Fixed potential NPE due copy/paste
mistake. Thanks to Josh Reagan for reporting.
Posted by da...@apache.org.
CAMEL-7120: Fixed potential NPE due copy/paste mistake. Thanks to Josh Reagan for reporting.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/642a1d69
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/642a1d69
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/642a1d69
Branch: refs/heads/camel-2.12.x
Commit: 642a1d695bd1b34700b845a43219737e77db1aae
Parents: 136d7c3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 10 10:32:34 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 10 10:32:58 2014 +0100
----------------------------------------------------------------------
.../camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/642a1d69/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index afb0c96..180b982 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -103,7 +103,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
// add the footer if it is in the exchange header
Map<String, Object> footerRow = (Map<String, Object>) exchange.getIn().getHeader(CAMEL_BINDY_FIXED_LENGTH_FOOTER);
- if (headerRow != null) {
+ if (footerRow != null) {
models.add(models.size(), footerRow);
}
[3/3] git commit: CAMEL-7120: Fixed potential NPE due copy/paste
mistake. Thanks to Josh Reagan for reporting.
Posted by da...@apache.org.
CAMEL-7120: Fixed potential NPE due copy/paste mistake. Thanks to Josh Reagan for reporting.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/570ec9ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/570ec9ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/570ec9ae
Branch: refs/heads/camel-2.11.x
Commit: 570ec9ae7a65c8d5eddc09d34ab3e8499b9e7f3a
Parents: c6de749
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 10 10:32:34 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 10 10:33:18 2014 +0100
----------------------------------------------------------------------
.../camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/570ec9ae/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index 8223bc3..94461ed 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -103,7 +103,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
// add the footer if it is in the exchange header
Map<String, Object> footerRow = (Map<String, Object>) exchange.getIn().getHeader(CAMEL_BINDY_FIXED_LENGTH_FOOTER);
- if (headerRow != null) {
+ if (footerRow != null) {
models.add(models.size(), footerRow);
}