From 7267896d56beaaa4bcee676900057fe7d8deb86c Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Tue, 21 Dec 2010 15:13:33 +0000 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3100 - JMX audit improvement git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1051521 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/activemq/broker/jmx/AnnotatedMBean.java | 4 ++-- assembly/src/release/conf/log4j.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java index e9b0345ca9..65d5bc5096 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java @@ -169,10 +169,10 @@ public class AnnotatedMBean extends StandardMBean { if (subject != null) { caller = ""; for (Principal principal : subject.getPrincipals()) { - caller += principal + " "; + caller += principal.getName() + " "; } } - LOG.info(caller + " called " + this.getMBeanInfo().getClassName() + "." + s + Arrays.toString(objects) + ""); + LOG.info(caller.trim() + " called " + this.getMBeanInfo().getClassName() + "." + s + Arrays.toString(objects) + ""); } return super.invoke(s, objects, strings); } diff --git a/assembly/src/release/conf/log4j.properties b/assembly/src/release/conf/log4j.properties index 531aeacd17..79f37a1ae4 100755 --- a/assembly/src/release/conf/log4j.properties +++ b/assembly/src/release/conf/log4j.properties @@ -63,4 +63,4 @@ log4j.appender.audit.maxFileSize=1024KB log4j.appender.audit.maxBackupIndex=5 log4j.appender.audit.append=true log4j.appender.audit.layout=org.apache.log4j.PatternLayout -log4j.appender.audit.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n \ No newline at end of file +log4j.appender.audit.layout.ConversionPattern=%d | %-5p | %m | %t%n \ No newline at end of file