Merge pull request #510 from jbonofre/AMQ-7301
[AMQ-7301] Fix build and using a single log message
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 7945cfb..081a035 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -87,6 +87,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 e68d6f6..280ded6 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
@@ -240,10 +240,9 @@
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 2f655c9..10fd8d8 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>
