Repository: camel Updated Branches: refs/heads/camel-2.12.x 2460888dc -> bafde2210
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/bafde221 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bafde221 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bafde221 Branch: refs/heads/camel-2.12.x Commit: bafde2210b5b89bcc654fcf50871de7011e7b8c6 Parents: 2460888 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:09:37 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/bafde221/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 7763423..81360ae 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 @@ -177,8 +177,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()}); + } } }
