diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-12-03 16:19:14 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-12-03 16:19:14 +0000 |
| commit | d55b46ed1644be65a774e211e5ff14c214301cc1 (patch) | |
| tree | 44f766a6599f6d662d36c470052de7f23e45fa2f /qpid/java/broker/src/velocity | |
| parent | 97e25803b14b671533fbd4f8ef0f0c19ad2a1be3 (diff) | |
| download | qpid-python-d55b46ed1644be65a774e211e5ff14c214301cc1.tar.gz | |
Merged r 886719:886722 from 0.5.x-dev.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@886842 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/velocity')
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java index 2efb22610f..738d54f8f4 100644 --- a/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java +++ b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java @@ -261,7 +261,7 @@ public class GenerateLogMessages if (message.startsWith(messageKey)) { // Method names can't have a '-' in them so lets make it '_' - // e.g. BRK_1001 + // e.g. BRK-STARTUP -> BRK_STARTUP logEntryData.put("methodName", message.replace('-', '_')); // Store the real name so we can use that in the actual log. logEntryData.put("name", message); diff --git a/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm index fecc9a787e..4eda0ffb19 100644 --- a/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm +++ b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm @@ -121,7 +121,7 @@ public class ${type.name}Messages public static LogMessage ${message.methodName}(#foreach($parameter in ${message.parameters})${parameter.type} ${parameter.name}#if (${velocityCount} != ${message.parameters.size()} ), #end #end#if(${message.parameters.size()} > 0 && ${message.options.size()} > 0), #end#foreach($option in ${message.options})boolean ${option.name}#if (${velocityCount} != ${message.options.size()} ), #end#end) { - String rawMessage = "${message.name} : " + _messages.getString("${message.name}"); + String rawMessage = _messages.getString("${message.name}"); ## If we have some options then we need to build the message based ## on those values so only provide that logic if we need it. #if(${message.options.size()} > 0) |