Author: rgodfrey
Date: Mon May 18 12:41:34 2015
New Revision: 1680008
URL: http://svn.apache.org/r1680008
Log:
QPID-6546 : EXH-1003 Message should put quotes around the exchange name and
routing key (Applied patch from Lorenz Quack)
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java?rev=1680008&r1=1680007&r2=1680008&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
Mon May 18 12:41:34 2015
@@ -61,7 +61,7 @@ public class ExchangeMessages
/**
* Log a Exchange message of the Format:
- * <pre>EXH-1003 : Discarded Message : Name: {0} Routing Key: {1}</pre>
+ * <pre>EXH-1003 : Discarded Message : Name: "{0}" Routing Key: "{1}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties?rev=1680008&r1=1680007&r2=1680008&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
Mon May 18 12:41:34 2015
@@ -22,4 +22,4 @@
# 1 - name
CREATED = EXH-1001 : Create :[ Durable] Type: {0} Name: {1}
DELETED = EXH-1002 : Deleted
-DISCARDMSG = EXH-1003 : Discarded Message : Name: {0} Routing Key: {1}
+DISCARDMSG = EXH-1003 : Discarded Message : Name: "{0}" Routing Key: "{1}"
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1680008&r1=1680007&r2=1680008&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
Mon May 18 12:41:34 2015
@@ -80,7 +80,7 @@ public class ExchangeMessagesTest extend
_logMessage = ExchangeMessages.DISCARDMSG(name, routingKey);
List<Object> log = performLog();
- String[] expected = {"Discarded Message :","Name:", name, "Routing
Key:", routingKey};
+ String[] expected = {"Discarded Message :","Name:", "\"" + name +
"\"", "Routing Key:", "\"" + routingKey + "\""};
validateLogMessage(log, "EXH-1003", expected);
}
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java?rev=1680008&r1=1680007&r2=1680008&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
Mon May 18 12:41:34 2015
@@ -239,7 +239,7 @@ public class ExchangeLoggingTest extends
final TextMessage msg = _session.createTextMessage("msg");
producer.send(msg);
- final String expectedMessageBody = "Discarded Message : Name: " +
_name + " Routing Key: " + _queue.getQueueName();
+ final String expectedMessageBody = "Discarded Message : Name: \"" +
_name + "\" Routing Key: \"" + _queue.getQueueName() + "\"";
// Ensure we have received the EXH log msg.
waitForMessage("EXH-1003");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
