From fd98b6a4804e09faf94fa9c64368b281f86df51a Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 4 Dec 2009 10:53:16 +0000 Subject: QPID-1992 : Fix compilation error missed during merge. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@887154 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/logging/subjects/ChannelLogSubject.java | 2 +- .../apache/qpid/server/logging/subjects/ConnectionLogSubject.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java index 62cff049d0..dc6e79a214 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java @@ -59,7 +59,7 @@ public class ChannelLogSubject extends AbstractLogSubject */ setLogStringWithFormat(CHANNEL_FORMAT, session.getSessionID(), - session.getAuthorizedID().getName(), + session.getPrincipal().getName(), session.getRemoteAddress(), session.getVirtualHost().getName(), channel.getChannelId()); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java index 77576eddfb..f3df87c432 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java @@ -82,7 +82,7 @@ public class ConnectionLogSubject extends AbstractLogSubject { if (!_upToDate) { - if (_session.getAuthorizedID() != null) + if (_session.getPrincipal() != null) { if (_session.getVirtualHost() != null) { @@ -101,7 +101,7 @@ public class ConnectionLogSubject extends AbstractLogSubject */ _logString = "[" + MessageFormat.format(ConnectionLogSubject.CONNECTION_FORMAT, _session.getSessionID(), - _session.getAuthorizedID().getName(), + _session.getPrincipal().getName(), _session.getRemoteAddress(), _session.getVirtualHost().getName()) + "] "; @@ -112,7 +112,7 @@ public class ConnectionLogSubject extends AbstractLogSubject { _logString = "[" + MessageFormat.format(USER_FORMAT, _session.getSessionID(), - _session.getAuthorizedID().getName(), + _session.getPrincipal().getName(), _session.getRemoteAddress()) + "] "; -- cgit v1.2.1