diff options
Diffstat (limited to 'java/broker-core/src/main/java/org/apache/qpid/server/logging')
2 files changed, 4 insertions, 4 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java index 5b0e34b73e..dcbb693cf1 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java @@ -46,7 +46,7 @@ public class ChannelLogSubject extends AbstractLogSubject AMQConnectionModel connection = session.getConnectionModel(); setLogStringWithFormat(CHANNEL_FORMAT, connection == null ? -1L : connection.getConnectionId(), - (connection == null || connection.getPrincipalAsString() == null) ? "?" : connection.getPrincipalAsString(), + (connection == null || connection.getAuthorizedPrincipal() == null) ? "?" : connection.getAuthorizedPrincipal().getName(), (connection == null || connection.getRemoteAddressString() == null) ? "?" : connection.getRemoteAddressString(), (connection == null || connection.getVirtualHostName() == null) ? "?" : connection.getVirtualHostName(), session.getChannelId()); diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java index 87c2377e0f..b1b8bc50ed 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java @@ -55,7 +55,7 @@ public class ConnectionLogSubject extends AbstractLogSubject { if (!_upToDate) { - if (_session.getPrincipalAsString() != null) + if (_session.getAuthorizedPrincipal() != null) { if (_session.getVirtualHostName() != null) { @@ -71,7 +71,7 @@ public class ConnectionLogSubject extends AbstractLogSubject */ setLogString("[" + MessageFormat.format(CONNECTION_FORMAT, _session.getConnectionId(), - _session.getPrincipalAsString(), + _session.getAuthorizedPrincipal().getName(), _session.getRemoteAddressString(), _session.getVirtualHostName()) + "] "); @@ -82,7 +82,7 @@ public class ConnectionLogSubject extends AbstractLogSubject { setLogString("[" + MessageFormat.format(USER_FORMAT, _session.getConnectionId(), - _session.getPrincipalAsString(), + _session.getAuthorizedPrincipal().getName(), _session.getRemoteAddressString()) + "] "); |