Author: ritchiem
Date: Fri Dec 4 10:53:16 2009
New Revision: 887154
URL: http://svn.apache.org/viewvc?rev=887154&view=rev
Log:
QPID-1992 : Fix compilation error missed during merge.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java?rev=887154&r1=887153&r2=887154&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
Fri Dec 4 10:53:16 2009
@@ -59,7 +59,7 @@
*/
setLogStringWithFormat(CHANNEL_FORMAT,
session.getSessionID(),
- session.getAuthorizedID().getName(),
+ session.getPrincipal().getName(),
session.getRemoteAddress(),
session.getVirtualHost().getName(),
channel.getChannelId());
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java?rev=887154&r1=887153&r2=887154&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
Fri Dec 4 10:53:16 2009
@@ -82,7 +82,7 @@
{
if (!_upToDate)
{
- if (_session.getAuthorizedID() != null)
+ if (_session.getPrincipal() != null)
{
if (_session.getVirtualHost() != null)
{
@@ -101,7 +101,7 @@
*/
_logString = "[" +
MessageFormat.format(ConnectionLogSubject.CONNECTION_FORMAT,
_session.getSessionID(),
-
_session.getAuthorizedID().getName(),
+
_session.getPrincipal().getName(),
_session.getRemoteAddress(),
_session.getVirtualHost().getName())
+ "] ";
@@ -112,7 +112,7 @@
{
_logString = "[" + MessageFormat.format(USER_FORMAT,
_session.getSessionID(),
-
_session.getAuthorizedID().getName(),
+
_session.getPrincipal().getName(),
_session.getRemoteAddress())
+ "] ";
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
