Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E27D6135 for ; Mon, 16 May 2011 10:17:39 +0000 (UTC) Received: (qmail 12916 invoked by uid 500); 16 May 2011 10:17:39 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 12851 invoked by uid 500); 16 May 2011 10:17:38 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 12844 invoked by uid 99); 16 May 2011 10:17:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 May 2011 10:17:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 May 2011 10:17:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 51CD723888DD; Mon, 16 May 2011 10:17:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1103673 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: broker/TransportConnection.java command/ConnectionInfo.java Date: Mon, 16 May 2011 10:17:15 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110516101715.51CD723888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Mon May 16 10:17:14 2011 New Revision: 1103673 URL: http://svn.apache.org/viewvc?rev=1103673&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3135 - add remote address to connection info advisory Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1103673&r1=1103672&r2=1103673&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Mon May 16 10:17:14 2011 @@ -687,6 +687,7 @@ public class TransportConnection impleme this.manageable = info.isManageable(); state.setContext(context); state.setConnection(this); + info.setClientIp(getRemoteAddress()); try { broker.addConnection(context, info); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java?rev=1103673&r1=1103672&r2=1103673&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java Mon May 16 10:17:14 2011 @@ -29,6 +29,7 @@ public class ConnectionInfo extends Base protected ConnectionId connectionId; protected String clientId; + protected String clientIp; protected String userName; protected String password; protected BrokerId[] brokerPath; @@ -68,6 +69,7 @@ public class ConnectionInfo extends Base copy.clientMaster = clientMaster; copy.transportContext = transportContext; copy.faultTolerant= faultTolerant; + copy.clientIp = clientIp; } /** @@ -228,4 +230,12 @@ public class ConnectionInfo extends Base public void setFailoverReconnect(boolean failoverReconnect) { this.failoverReconnect = failoverReconnect; } + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } }