diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-15 10:14:24 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-15 10:14:24 +0000 |
| commit | a510c8d1ecb2b5ac02bd64d202b4fbe2a5fbdac2 (patch) | |
| tree | cb2a8102af136546bf250b457a8bad208bfc9db3 | |
| parent | 6a7f66cac55a448f351d6209d098e945e6c9e584 (diff) | |
| download | qpid-python-a510c8d1ecb2b5ac02bd64d202b4fbe2a5fbdac2.tar.gz | |
QPID-6002 : [Java Broker] NullPointerException when writing message discard logging message
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618139 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 7877812d84..49bc26149e 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -474,13 +474,12 @@ public class AMQChannel<T extends AMQProtocolSession<T>> } else { - getVirtualHost().getEventLogger().message(ExchangeMessages.DISCARDMSG(_currentMessage.getExchangeName().asString(), - _currentMessage.getMessagePublishInfo().getRoutingKey() - == null - ? null - : _currentMessage.getMessagePublishInfo() - .getRoutingKey() - .toString())); + AMQShortString exchangeName = _currentMessage.getExchangeName(); + AMQShortString routingKey = _currentMessage.getMessagePublishInfo().getRoutingKey(); + + getVirtualHost().getEventLogger().message( + ExchangeMessages.DISCARDMSG(exchangeName == null ? null : exchangeName.asString(), + routingKey == null ? null : routingKey.asString())); } } |