Repository: camel Updated Branches: refs/heads/camel-2.16.x 612ec99f8 -> d155bc500 refs/heads/master 6c857fd5e -> b121af112
CAMEL-9557: Facebook consumer throws IllegalArgumentException with reading parameters Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b5411f5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b5411f5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b5411f5 Branch: refs/heads/master Commit: 5b5411f5feb002fe77a19c4a303f09d474494a26 Parents: 6c857fd Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 3 08:32:01 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 3 08:32:01 2016 +0100 ---------------------------------------------------------------------- .../component/facebook/data/FacebookPropertiesHelper.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5b5411f5/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java index 1dd7079..d4d0b89 100644 --- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java +++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java @@ -69,8 +69,6 @@ public final class FacebookPropertiesHelper { options, FacebookConstants.READING_PREFIX); if (!readingProperties.isEmpty()) { try { - configuration.setReadingOptions(readingProperties); - // add to an existing reading reference? // NOTE Reading class does not support overwriting properties!!! Reading reading = configuration.getReading(); @@ -78,19 +76,16 @@ public final class FacebookPropertiesHelper { if (reading != null) { Reading readingUpdate = new Reading(); ReadingBuilder.setProperties(readingUpdate, readingProperties); - reading = ReadingBuilder.merge(reading, readingUpdate); } else { reading = new Reading(); ReadingBuilder.setProperties(reading, readingProperties); } // set properties - ReadingBuilder.setProperties(reading, - readingProperties); + ReadingBuilder.setProperties(reading, readingProperties); // update reading in configuration configuration.setReading(reading); - } catch (Exception e) { throw new IllegalArgumentException(readingProperties.toString(), e); } @@ -112,8 +107,7 @@ public final class FacebookPropertiesHelper { int nProperties = 0; for (Map.Entry<String, Object> entry : exchange.getIn().getHeaders().entrySet()) { if (entry.getKey().startsWith(FacebookConstants.FACEBOOK_PROPERTY_PREFIX)) { - properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()), - entry.getValue()); + properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()), entry.getValue()); nProperties++; } }
