You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2012/04/09 20:11:43 UTC

svn commit: r1311361 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java

Author: grkvlt
Date: Mon Apr  9 18:11:43 2012
New Revision: 1311361

URL: http://svn.apache.org/viewvc?rev=1311361&view=rev
Log:
Replace log message formatting with null object dereferences

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1311361&r1=1311360&r2=1311361&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Mon Apr  9 18:11:43 2012
@@ -253,10 +253,9 @@ public class VirtualHostConfigRecoveryHa
                 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 VirtualHostConfigRecoveryHa
                 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 VirtualHostConfigRecoveryHa
                 StringBuilder xidString = xidAsString(id);
                 CurrentActor.get().message(_logSubject,
                                            TransactionLogMessages.XA_INCOMPLETE_QUEUE(xidString.toString(),
-                                                                                      queue.getName()));
+                                                                                      record.getQueue().getResourceName()));
             }
 
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org