Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from jbonofre/AMQ-7301 

[AMQ-7301] Fix build and using a single log message
This commit is contained in:
Jean-Baptiste Onofré 2020-03-11 17:57:28 +01:00 committed by GitHub
parent ee61ed69f8 960bc24d17
commit 8f5d583ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-broker/pom.xml
View File

@ -87,6 +87,11 @@
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>
</dependencies> </dependencies>
<reporting> <reporting>

5
activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -240,10 +240,9 @@ public class TransportConnector implements Connector, BrokerServiceAware {
private void onAcceptError(Exception error, String remoteHost) { private void onAcceptError(Exception error, String remoteHost) {
if (brokerService != null && brokerService.isStopping()) { 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 { } else {
LOG.warn("Could not accept connection from {}: {}", (remoteHost == null ? "" : "from " + remoteHost), error.getMessage()); LOG.warn("Could not accept connection from {}: {} ({})", (remoteHost == null ? "" : "from " + remoteHost), error.getMessage(), Throwables.getRootCause(error).getMessage());
LOG.warn("Root cause of connection error: {}", Throwables.getRootCause(error).getMessage());
LOG.debug("Reason: " + error.getMessage(), error); LOG.debug("Reason: " + error.getMessage(), error);
} }
} }

3
activemq-osgi/pom.xml
View File

@ -102,7 +102,8 @@
com.google.errorprone.annotations.concurrent, com.google.errorprone.annotations.concurrent,
com.google.j2objc.annotations, com.google.j2objc.annotations,
org.linkedin*, org.linkedin*,
org.iq80* org.iq80*,
com.google.common.base
</activemq.osgi.private.pkg> </activemq.osgi.private.pkg>
<activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import> <activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
<surefire.argLine>-Xmx512M</surefire.argLine> <surefire.argLine>-Xmx512M</surefire.argLine>