You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2011/12/13 14:42:37 UTC
svn commit: r1213691 - in
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker:
TransportConnection.java TransportConnector.java
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<String, String> 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
+}