From 7c0146192f181793594a2f8f805708fae6502031 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 24 Feb 2012 08:48:32 +0000 Subject: QPID-24 : Fix potential NPE in log message on recovery of xids where the queue was transient git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293136 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java index 2202efb5e3..0e965472d5 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java @@ -29,8 +29,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.UUID; - -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.AMQStoreException; @@ -59,7 +57,6 @@ import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.txn.DtxBranch; import org.apache.qpid.server.txn.DtxRegistry; import org.apache.qpid.server.txn.ServerTransaction; -import org.apache.qpid.transport.Binary; import org.apache.qpid.transport.Xid; import org.apache.qpid.transport.util.Functions; import org.apache.qpid.util.ByteBufferInputStream; @@ -271,7 +268,7 @@ public class VirtualHostConfigRecoveryHandler implements ConfigurationRecoveryHa StringBuilder xidString = xidAsString(id); CurrentActor.get().message(_logSubject, TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(), - queue.getName())); + record.getQueue().getResourceName())); } } -- cgit v1.2.1