From c7597a7288b2a896fd7fca6d51f69aeaf5bd544f Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Mon, 9 Apr 2012 18:11:43 +0000 Subject: Replace log message formatting with null object dereferences git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1311361 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 1db26a5f04..9333456c2e 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 @@ -253,10 +253,9 @@ public class VirtualHostConfigRecoveryHandler implements ConfigurationRecoveryHa else { StringBuilder xidString = xidAsString(id); - String messageNumberString = String.valueOf(message.getMessageNumber()); CurrentActor.get().message(_logSubject, TransactionLogMessages.XA_INCOMPLETE_MESSAGE(xidString.toString(), - messageNumberString)); + Long.toString(messageId))); } @@ -304,10 +303,9 @@ public class VirtualHostConfigRecoveryHandler implements ConfigurationRecoveryHa else { StringBuilder xidString = xidAsString(id); - String messageNumberString = String.valueOf(message.getMessageNumber()); CurrentActor.get().message(_logSubject, TransactionLogMessages.XA_INCOMPLETE_MESSAGE(xidString.toString(), - messageNumberString)); + Long.toString(messageId))); } @@ -317,7 +315,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