You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/03/11 16:59:41 UTC
[activemq] branch activemq-5.15.x updated: [AMQ-7301] Fix build and
using a single log message
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 9c73332 [AMQ-7301] Fix build and using a single log message
9c73332 is described below
commit 9c733328dc4a5f0b191efd9edb23eb5c451dcb3e
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Mar 11 17:21:01 2020 +0100
[AMQ-7301] Fix build and using a single log message
(cherry picked from commit 960bc24d17e955cea854124a3bbaeb5d912746ea)
---
activemq-broker/pom.xml | 5 +++++
.../src/main/java/org/apache/activemq/broker/TransportConnector.java | 5 ++---
activemq-osgi/pom.xml | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index a7c01a2..36387cc 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -92,6 +92,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ </dependency>
</dependencies>
<reporting>
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
index f07584f..8f23a24 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -241,10 +241,9 @@ public class TransportConnector implements Connector, BrokerServiceAware {
private void onAcceptError(Exception error, String remoteHost) {
if (brokerService != null && brokerService.isStopping()) {
- LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
+ LOG.info("Could not accept connection during shutdown {} : {} ({})", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage(), Throwables.getRootCause(error).getMessage());
} else {
- LOG.warn("Could not accept connection from {}: {}", (remoteHost == null ? "" : "from " + remoteHost), error.getMessage());
- LOG.warn("Root cause of connection error: {}", Throwables.getRootCause(error).getMessage());
+ LOG.warn("Could not accept connection from {}: {} ({})", (remoteHost == null ? "" : "from " + remoteHost), error.getMessage(), Throwables.getRootCause(error).getMessage());
LOG.debug("Reason: " + error.getMessage(), error);
}
}
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index b7d1180..1acc6a6 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -102,7 +102,8 @@
com.google.errorprone.annotations.concurrent,
com.google.j2objc.annotations,
org.linkedin*,
- org.iq80*
+ org.iq80*,
+ com.google.common.base
</activemq.osgi.private.pkg>
<activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
<surefire.argLine>-Xmx512M</surefire.argLine>