Repository: camel Updated Branches: refs/heads/master 624b1abc7 -> 07043c1fd
CAMEL-7571: Fixed potential NPE iin camel-rabbitmq f debug logging was enabled. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07043c1f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07043c1f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07043c1f Branch: refs/heads/master Commit: 07043c1fd2510ac0c84165a7fddc7bd6a58d048e Parents: 624b1ab Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 3 08:08:49 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 3 08:08:49 2014 +0200 ---------------------------------------------------------------------- .../apache/camel/component/rabbitmq/RabbitMQProducer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/07043c1f/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java index 2e22d3f..ea02ce2 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java @@ -200,8 +200,12 @@ public class RabbitMQProducer extends DefaultProducer { if (value != null) { filteredHeaders.put(header.getKey(), header.getValue()); } else if (log.isDebugEnabled()) { - log.debug("Ignoring header: {} of class: {} with value: {}", - new Object[]{header.getKey(), header.getValue().getClass().getName(), header.getValue()}); + if (header.getValue() == null) { + log.debug("Ignoring header: {} with null value", header.getKey()); + } else { + log.debug("Ignoring header: {} of class: {} with value: {}", + new Object[]{header.getKey(), ObjectHelper.classCanonicalName(header.getValue()), header.getValue()}); + } } }
