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 3F3367C16 for ; Tue, 13 Dec 2011 13:43:00 +0000 (UTC) Received: (qmail 26074 invoked by uid 500); 13 Dec 2011 13:43:00 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 26046 invoked by uid 500); 13 Dec 2011 13:42:59 -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 26039 invoked by uid 99); 13 Dec 2011 13:42:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 13:42:59 +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; Tue, 13 Dec 2011 13:42:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D5D012388980 for ; Tue, 13 Dec 2011 13:42:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213691 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker: TransportConnection.java TransportConnector.java Date: Tue, 13 Dec 2011 13:42:37 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213134237.D5D012388980@eris.apache.org> Author: tabish Date: Tue Dec 13 13:42:37 2011 New Revision: 1213691 URL: http://svn.apache.org/viewvc?rev=1213691&view=rev Log: apply patch for: https://issues.apache.org/jira/browse/AMQ-3624 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.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=1213691&r1=1213690&r2=1213691&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 Tue Dec 13 13:42:37 2011 @@ -196,9 +196,9 @@ public class TransportConnection impleme if (!stopping.get()) { transportException.set(e); if (TRANSPORTLOG.isDebugEnabled()) { - TRANSPORTLOG.debug("Transport failed: " + e, e); + TRANSPORTLOG.debug(this + " failed: " + e, e); } else if (TRANSPORTLOG.isWarnEnabled() && !expected(e)) { - TRANSPORTLOG.warn("Transport failed: " + e); + TRANSPORTLOG.warn(this + " failed: " + e); } stopAsync(); } @@ -1256,7 +1256,7 @@ public class TransportConnection impleme return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private HashMap createMap(Properties properties) { return new HashMap(properties); } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=1213691&r1=1213690&r2=1213691&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Tue Dec 13 13:42:37 2011 @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; /** * @org.apache.xbean.XBean - * + * */ public class TransportConnector implements Connector, BrokerServiceAware { @@ -130,7 +130,7 @@ public class TransportConnector implemen } /** - * + * * @deprecated use the {@link #setBrokerService(BrokerService)} method * instead. */ @@ -168,7 +168,7 @@ public class TransportConnector implemen * {@link TransportServer} configured via the * {@link #setServer(TransportServer)} method. This value is used to lazy * create a {@link TransportServer} instance - * + * * @param uri */ public void setUri(URI uri) { @@ -218,8 +218,9 @@ public class TransportConnector implemen Connection connection = createConnection(transport); connection.start(); } catch (Exception e) { + String remoteHost = transport.getRemoteAddress(); ServiceSupport.dispose(transport); - onAcceptError(e); + onAcceptError(e, remoteHost); } } }); @@ -526,7 +527,7 @@ public class TransportConnector implemen public void setRebalanceClusterClients(boolean rebalanceClusterClients) { this.rebalanceClusterClients = rebalanceClusterClients; } - + /** * @return the updateClusterClientsOnRemove */ @@ -540,7 +541,7 @@ public class TransportConnector implemen public void setUpdateClusterClientsOnRemove(boolean updateClusterClientsOnRemove) { this.updateClusterClientsOnRemove = updateClusterClientsOnRemove; } - + /** * @return the updateClusterFilter */ @@ -572,4 +573,4 @@ public class TransportConnector implemen public void setAuditNetworkProducers(boolean auditNetworkProducers) { this.auditNetworkProducers = auditNetworkProducers; } -} \ No newline at end of file +}