Repository: activemq-artemis
Updated Branches:
  refs/heads/master 8ce397851 -> 85ce8ccbb


ARTEMIS-804 log ref when no DLA configured


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1945f836
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1945f836
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1945f836

Branch: refs/heads/master
Commit: 1945f836af6352d9796969ab56ea57c60fc0fc67
Parents: 8ce3978
Author: jbertram <jbert...@apache.com>
Authored: Tue Oct 18 16:15:58 2016 -0500
Committer: jbertram <jbert...@apache.com>
Committed: Tue Oct 18 16:15:58 2016 -0500

----------------------------------------------------------------------
 .../activemq/artemis/core/server/ActiveMQServerLogger.java       | 4 ++--
 .../org/apache/activemq/artemis/core/server/impl/QueueImpl.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1945f836/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 6e32b35..f6b3248 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -960,9 +960,9 @@ public interface ActiveMQServerLogger extends BasicLogger {
    void messageExceededMaxDeliverySendtoDLA(MessageReference ref, SimpleString 
name, SimpleString simpleString);
 
    @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 222150, value = "Message has exceeded max delivery attempts. 
No Dead Letter Address configured for queue {0} so dropping it",
+   @Message(id = 222150, value = "Message {0} has exceeded max delivery 
attempts. No Dead Letter Address configured for queue {1} so dropping it",
       format = Message.Format.MESSAGE_FORMAT)
-   void messageExceededMaxDeliveryNoDLA(SimpleString name);
+   void messageExceededMaxDeliveryNoDLA(MessageReference ref, SimpleString 
name);
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222151, value = "removing consumer which did not handle a 
message, consumer={0}, message={1}",

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1945f836/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index bf6b725..5ece228 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2395,7 +2395,7 @@ public class QueueImpl implements Queue {
             move(tx, deadLetterAddress, ref, false, AckReason.KILLED);
          }
       } else {
-         ActiveMQServerLogger.LOGGER.messageExceededMaxDeliveryNoDLA(name);
+         ActiveMQServerLogger.LOGGER.messageExceededMaxDeliveryNoDLA(ref, 
name);
 
          ref.acknowledge(tx, AckReason.KILLED);
       }

Reply via email to