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/02/22 06:53:13 UTC
[activemq] branch activemq-5.15.x updated (3a275c0 -> 8b30145)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git.
from 3a275c0 [AMQ-7414] Upgrade to Tomcat 9.0.31
new a79a945 Utilize parameterized logging
new 76c19d4 Fix inconsistent 'info'-level logger calls
new 06d9f95 Mark `staticCache' final
new ab03265 Reformat some code
new f556247 Use simpler SLF4J API functions
new d05fe8e Fix some typos
new 8e44be8 Fix an apparent copy/paste typo
new 8b30145 Fix some incorrect SLF4J logger calls
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../transport/amqp/client/AmqpConnection.java | 2 +-
.../org/apache/activemq/broker/BrokerService.java | 2 +-
.../broker/jmx/NetworkDestinationView.java | 2 +-
.../org/apache/activemq/broker/region/Topic.java | 4 +-
.../cursors/StoreDurableSubscriberCursor.java | 2 +-
.../broker/region/cursors/TopicStorePrefetch.java | 2 +-
.../policy/AbortSlowAckConsumerStrategy.java | 2 +-
.../network/DemandForwardingBridgeSupport.java | 2 +-
.../activemq/network/jms/DestinationBridge.java | 2 +-
.../apache/activemq/JmsTransactionTestSupport.java | 34 ++++++++--------
.../apache/activemq/ActiveMQMessageConsumer.java | 2 +-
.../apache/activemq/jndi/JNDIReferenceFactory.java | 2 +-
.../transport/AbstractInactivityMonitor.java | 2 +-
.../multicast/MulticastDiscoveryAgent.java | 45 ++++++++++++----------
.../java/org/apache/activemq/util/IdGenerator.java | 2 +-
.../activemq/transport/ws/MQTTWSConnection.java | 4 +-
.../org/apache/activemq/jaas/PropertiesLoader.java | 2 +-
.../apache/activemq/jms/pool/PooledConnection.java | 2 +-
.../activemq/jms/pool/JmsPoolTestSupport.java | 6 +--
.../kahadb/MultiKahaDBPersistenceAdapter.java | 8 ++--
.../transport/mqtt/MQTTProtocolConverter.java | 2 +-
.../activemq/ra/ActiveMQResourceAdapter.java | 2 +-
.../apache/activemq/ra/LocalAndXATransaction.java | 2 +-
23 files changed, 69 insertions(+), 66 deletions(-)
[activemq] 07/08: Fix an apparent copy/paste typo
Posted by jb...@apache.org.
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
commit 8e44be880677774a4a2d90000164be8022c2c41d
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:18:26 2017 -0700
Fix an apparent copy/paste typo
(cherry picked from commit 057cf666a06450c84536a42a15c4b8da6ba641b7)
---
.../java/org/apache/activemq/broker/jmx/NetworkDestinationView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkDestinationView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkDestinationView.java
index 1dceee4..5cdf024 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkDestinationView.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/NetworkDestinationView.java
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NetworkDestinationView implements NetworkDestinationViewMBean {
- private static final Logger LOG = LoggerFactory.getLogger(NetworkDestinationViewMBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NetworkDestinationView.class);
private TimeStatisticImpl timeStatistic = new TimeStatisticImpl("networkEnqueue","network messages enqueued");
private final String name;
[activemq] 03/08: Mark `staticCache' final
Posted by jb...@apache.org.
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
commit 06d9f955ce68df3add0bfcca0bbc35c2784efabc
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:32:59 2017 -0700
Mark `staticCache' final
This fixes a warning in NetBeans IDE about synchronizing on a non-final
field.
(cherry picked from commit 7480c660318416ebf41816122ad9b71157329a11)
---
.../src/main/java/org/apache/activemq/jaas/PropertiesLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoader.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoader.java
index 56d205d..3f2df61 100644
--- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoader.java
+++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoader.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
public class PropertiesLoader {
private static final Logger LOG = LoggerFactory.getLogger(PropertiesLoader.class);
- static Map<FileNameKey, ReloadableProperties> staticCache = new HashMap<FileNameKey, ReloadableProperties>();
+ static final Map<FileNameKey, ReloadableProperties> staticCache = new HashMap<FileNameKey, ReloadableProperties>();
protected boolean debug;
public void init(Map options) {
[activemq] 02/08: Fix inconsistent 'info'-level logger calls
Posted by jb...@apache.org.
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
commit 76c19d4eb677b8e2170ea9de4c81bf7a5f217779
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:47:35 2017 -0700
Fix inconsistent 'info'-level logger calls
Some calls to info() were guarded by checks that logging at the trace
level is enabled.
These issues were found by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
(cherry picked from commit 6d36c490e5ddaeed92632dbb4f3ca8773a8a5bfa)
---
.../apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
index 56e5e92..b1ee0b1 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
@@ -198,7 +198,7 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem
if (filteredAdapter.getDestination() == matchAll && filteredAdapter.isPerDestination()) {
filteredAdapter = addAdapter(filteredAdapter, destination);
if (LOG.isTraceEnabled()) {
- LOG.info("created per destination adapter for: " + destination + ", " + result);
+ LOG.trace("created per destination adapter for: " + destination + ", " + result);
}
}
startAdapter(filteredAdapter.getPersistenceAdapter(), destination.getQualifiedName());
@@ -330,11 +330,11 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem
if (adapterDir != null) {
if (IOHelper.deleteFile(adapterDir)) {
if (LOG.isTraceEnabled()) {
- LOG.info("deleted per destination adapter directory for: " + destination);
+ LOG.trace("deleted per destination adapter directory for: " + destination);
}
} else {
if (LOG.isTraceEnabled()) {
- LOG.info("failed to deleted per destination adapter directory for: " + destination);
+ LOG.trace("failed to deleted per destination adapter directory for: " + destination);
}
}
}
[activemq] 04/08: Reformat some code
Posted by jb...@apache.org.
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
commit ab032655e16f6c4b96fc5b076a8130bf9b4fa6fe
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:28:18 2017 -0700
Reformat some code
(cherry picked from commit 252dda94a3f40d809ce5c8c118b24c2c05e77c5e)
---
.../multicast/MulticastDiscoveryAgent.java | 45 ++++++++++++----------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
index cf1da42..8624a06 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
@@ -291,27 +291,30 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
discoveryURI = new URI(DEFAULT_DISCOVERY_URI_STRING);
}
- if (LOG.isTraceEnabled())
- LOG.trace("start - discoveryURI = " + discoveryURI);
-
- String myHost = discoveryURI.getHost();
- int myPort = discoveryURI.getPort();
-
- if( DEFAULT_HOST_STR.equals(myHost) )
- myHost = DEFAULT_HOST_IP;
-
- if(myPort < 0 )
- myPort = DEFAULT_PORT;
-
- if (LOG.isTraceEnabled()) {
- LOG.trace("start - myHost = " + myHost);
- LOG.trace("start - myPort = " + myPort);
- LOG.trace("start - group = " + group );
- LOG.trace("start - interface = " + mcInterface );
- LOG.trace("start - network interface = " + mcNetworkInterface );
- LOG.trace("start - join network interface = " + mcJoinNetworkInterface );
- }
-
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("start - discoveryURI = " + discoveryURI);
+ }
+
+ String myHost = discoveryURI.getHost();
+ int myPort = discoveryURI.getPort();
+
+ if (DEFAULT_HOST_STR.equals(myHost)) {
+ myHost = DEFAULT_HOST_IP;
+ }
+
+ if (myPort < 0) {
+ myPort = DEFAULT_PORT;
+ }
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("start - myHost = " + myHost);
+ LOG.trace("start - myPort = " + myPort);
+ LOG.trace("start - group = " + group);
+ LOG.trace("start - interface = " + mcInterface);
+ LOG.trace("start - network interface = " + mcNetworkInterface);
+ LOG.trace("start - join network interface = " + mcJoinNetworkInterface);
+ }
+
this.inetAddress = InetAddress.getByName(myHost);
this.sockAddress = new InetSocketAddress(this.inetAddress, myPort);
mcast = new MulticastSocket(myPort);
[activemq] 06/08: Fix some typos
Posted by jb...@apache.org.
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
commit d05fe8ebdbec2652050624b0a1a30fe67419da57
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:23:27 2017 -0700
Fix some typos
(cherry picked from commit 7b528ecee77f02426e3f2b16cd49ccfaeb221f95)
---
.../org/apache/activemq/broker/BrokerService.java | 2 +-
.../cursors/StoreDurableSubscriberCursor.java | 2 +-
.../broker/region/cursors/TopicStorePrefetch.java | 2 +-
.../apache/activemq/JmsTransactionTestSupport.java | 34 +++++++++++-----------
.../apache/activemq/ActiveMQMessageConsumer.java | 2 +-
.../apache/activemq/jndi/JNDIReferenceFactory.java | 2 +-
.../java/org/apache/activemq/util/IdGenerator.java | 2 +-
.../apache/activemq/jms/pool/PooledConnection.java | 2 +-
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 40547d5..b4cdcac 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -2163,7 +2163,7 @@ public class BrokerService implements Service {
/**
* Schedules a periodic task based on schedulePeriodForDiskLimitCheck to
* update store and temporary store limits if the amount of available space
- * plus current store size is less than the existin configured limit
+ * plus current store size is less than the existing configured limit
*/
protected void scheduleDiskUsageLimitsCheck() throws IOException {
if (schedulePeriodForDiskUsageCheck > 0 &&
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
index 7864556..807f26a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
@@ -199,7 +199,7 @@ public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
if (prioritizedMessages && immediatePriorityDispatch && tsp.isPaging()) {
if (msg.getPriority() > tsp.getLastRecoveredPriority()) {
tsp.recoverMessage(node.getMessage(), true);
- LOG.trace("cached high priority ({} message: {}, current paged batch priority: {}, cache size: {}", new Object[]{ msg.getPriority(), msg.getMessageId(), tsp.getLastRecoveredPriority(), tsp.batchList.size()});
+ LOG.trace("cached high priority ({}) message: {}, current paged batch priority: {}, cache size: {}", new Object[]{ msg.getPriority(), msg.getMessageId(), tsp.getLastRecoveredPriority(), tsp.batchList.size()});
}
}
}
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
index 71bb4eb..a97b1e8 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * persist pendingCount messages pendingCount message (messages awaiting disptach
+ * persist pendingCount messages pendingCount message (messages awaiting dispatch
* to a consumer) cursor
*
*
diff --git a/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
index 539a1e0..e5bdbdf 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
@@ -162,7 +162,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
TextMessage message = session.createTextMessage("Batch Message");
for (int j = 0; j < batchCount; j++) {
- LOG.info("Producing bacth " + j + " of " + batchSize + " messages");
+ LOG.info("Producing batch " + j + " of " + batchSize + " messages");
beginTx();
for (int i = 0; i < batchSize; i++) {
@@ -170,7 +170,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
messageSent();
commitTx();
- LOG.info("Consuming bacth " + j + " of " + batchSize + " messages");
+ LOG.info("Consuming batch " + j + " of " + batchSize + " messages");
beginTx();
for (int i = 0; i < batchSize; i++) {
@@ -187,7 +187,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and validates that the rollbacked message was
+ * Sends a batch of messages and validates that the rolled-back message was
* not consumed.
*
* @throws Exception
@@ -200,7 +200,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
- // sends a message that gets rollbacked
+ // sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
rollbackTx();
@@ -224,7 +224,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
- // validates that the rollbacked was not consumed
+ // validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@@ -253,7 +253,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
- // validates that the rollbacked was not consumed
+ // validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@@ -275,7 +275,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
- // sends a message that gets rollbacked
+ // sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
consumer.close();
@@ -300,7 +300,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
- // validates that the rollbacked was not consumed
+ // validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@@ -321,7 +321,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
producer.send(outbound[0]);
commitTx();
- // sends a message that gets rollbacked
+ // sends a message that gets rolled-back
beginTx();
producer.send(session.createTextMessage("I'm going to get rolled back."));
consumer.close();
@@ -348,7 +348,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
messages.add(message);
LOG.info("Received: " + message);
- // validates that the rollbacked was not consumed
+ // validates that the rolled-back was not consumed
commitTx();
Message inbound[] = new Message[messages.size()];
messages.toArray(inbound);
@@ -356,7 +356,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and validates that the rollbacked message was
+ * Sends a batch of messages and validates that the rolled-back message was
* redelivered.
*
* @throws Exception
@@ -407,7 +407,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and validates that the rollbacked message was
+ * Sends a batch of messages and validates that the rolled-back message was
* redelivered.
*
* @throws Exception
@@ -461,7 +461,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and validates that the rollbacked message was
+ * Sends a batch of messages and validates that the rolled-back message was
* not consumed.
*
* @throws Exception
@@ -487,12 +487,12 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
LOG.info("Received: " + message);
}
- // validates that the rollbacked was not consumed
+ // validates that the rolled-back was not consumed
commitTx();
}
/**
- * Perform the test that validates if the rollbacked message was redelivered
+ * Perform the test that validates if the rolled-back message was redelivered
* multiple times.
*
* @throws Exception
@@ -504,7 +504,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and validates that the rollbacked message was
+ * Sends a batch of messages and validates that the rolled-back message was
* not consumed. This test differs by setting the message prefetch to one.
*
* @throws Exception
@@ -515,7 +515,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
}
/**
- * Sends a batch of messages and and validates that the rollbacked message
+ * Sends a batch of messages and and validates that the rolled-back message
* was redelivered. This test differs by setting the message prefetch to
* one.
*
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
index 5c7015b..6e927f0 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
@@ -806,7 +806,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
try {
session.sendAck(ackToSend,true);
} catch (JMSException e) {
- LOG.error(getConsumerId() + " failed to delivered acknowledgements", e);
+ LOG.error(getConsumerId() + " failed to deliver acknowledgements", e);
} finally {
deliveryingAcknowledgements.set(false);
}
diff --git a/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
index 9d7c11e..1619a8e 100644
--- a/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
@@ -40,7 +40,7 @@ public class JNDIReferenceFactory implements ObjectFactory {
/**
* This will be called by a JNDIprovider when a Reference is retrieved from
- * a JNDI store - and generates the orignal instance
+ * a JNDI store - and generates the original instance
*
* @param object the Reference object
* @param name the JNDI name
diff --git a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
index 0b29416..09a5658 100644
--- a/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/IdGenerator.java
@@ -184,7 +184,7 @@ public class IdGenerator {
/**
* From a generated id - return the seed (i.e. minus the count)
*
- * @param id the generated identifer
+ * @param id the generated identifier
* @return the seed
*/
public static String getSeedFromId(String id) {
diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java
index 111e730..2b57039 100644
--- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java
+++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java
@@ -256,7 +256,7 @@ public class PooledConnection implements TopicConnection, QueueConnection, Poole
try {
session.close();
} catch (JMSException ex) {
- LOG.info("failed to close laoned Session \"" + session + "\" on closing pooled connection: " + ex.getMessage());
+ LOG.info("failed to close loaned Session \"" + session + "\" on closing pooled connection: " + ex.getMessage());
}
}
loanedSessions.clear();
[activemq] 05/08: Use simpler SLF4J API functions
Posted by jb...@apache.org.
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
commit f556247646c35816f76c2e63f17a971aca60e6d8
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 19:24:59 2017 -0700
Use simpler SLF4J API functions
Eliminates the need to construct a new (temporary) Object array object.
These changes were suggested by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
(cherry picked from commit 3faad9b3574336413166f348ca2438c9a7f7cce1)
---
.../org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java | 2 +-
.../src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
index b1ee0b1..7e28d04 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
@@ -202,7 +202,7 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implem
}
}
startAdapter(filteredAdapter.getPersistenceAdapter(), destination.getQualifiedName());
- LOG.debug("destination {} matched persistence adapter {}", new Object[]{destination.getQualifiedName(), filteredAdapter.getPersistenceAdapter()});
+ LOG.debug("destination {} matched persistence adapter {}", destination.getQualifiedName(), filteredAdapter.getPersistenceAdapter());
return filteredAdapter.getPersistenceAdapter();
}
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java b/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java
index 1dd7423..75d691b 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java
@@ -132,7 +132,7 @@ public class LocalAndXATransaction implements XAResource, LocalTransaction {
public Xid[] recover(int arg0) throws XAException {
Xid[] answer = null;
- LOG.trace("{} recover({})", new Object[]{this, arg0});
+ LOG.trace("{} recover({})", this, arg0);
answer = transactionContext.recover(arg0);
LOG.trace("{} recover({}) = {}", new Object[]{this, arg0, answer});
return answer;
[activemq] 08/08: Fix some incorrect SLF4J logger calls
Posted by jb...@apache.org.
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
commit 8b30145ff3fb9f9343ae6db9e9a69c0c22404ea9
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Fri Jul 28 18:58:05 2017 -0700
Fix some incorrect SLF4J logger calls
In some cases, there were an inconsistent number of formatting anchors.
In other cases, formatting anchors were used, but because the
trace/debug/info/warn/error(String, Throwable) variant was used, the
string is a message string rather than a format string.
These issues were found by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
(cherry picked from commit b020cba74470fffff7383de5f5400bff2b4f99c8)
---
.../org/apache/activemq/transport/amqp/client/AmqpConnection.java | 2 +-
.../src/main/java/org/apache/activemq/broker/region/Topic.java | 4 ++--
.../activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java | 2 +-
.../org/apache/activemq/network/DemandForwardingBridgeSupport.java | 2 +-
.../main/java/org/apache/activemq/network/jms/DestinationBridge.java | 2 +-
.../java/org/apache/activemq/transport/AbstractInactivityMonitor.java | 2 +-
.../test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java | 4 ++--
.../test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java | 2 +-
.../org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java | 2 +-
.../src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
index 3fe3ab6..31eacc3 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
@@ -228,7 +228,7 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
request.sync(closeTimeout, TimeUnit.MILLISECONDS);
}
} catch (IOException e) {
- LOG.warn("Error caught while closing Provider: ", e.getMessage());
+ LOG.warn("Error caught while closing Provider: {}", e.getMessage());
} finally {
if (transport != null) {
try {
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index c30916c..59190f1 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -877,10 +877,10 @@ public class Topic extends BaseDestination implements Task {
try {
durableTopicSubscription.dispatchPending();
} catch (IOException exception) {
- LOG.warn("After clear of pending, failed to dispatch to: {}, for: {}, pending: {}", new Object[]{
+ LOG.warn("After clear of pending, failed to dispatch to: {}, for: {}, pending: {}, exception: {}", new Object[]{
durableTopicSubscription,
destination,
- durableTopicSubscription.pending }, exception);
+ durableTopicSubscription.pending, exception });
}
}
}
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
index 1bbca52..06be1f9 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
@@ -146,7 +146,7 @@ public class AbortSlowAckConsumerStrategy extends AbortSlowConsumerStrategy {
if (getMaxSlowDuration() > 0 && (entry.getValue().markCount * getCheckPeriod() >= getMaxSlowDuration()) ||
getMaxSlowCount() > 0 && entry.getValue().slowCount >= getMaxSlowCount()) {
- LOG.trace("Transferring consumer{} to the abort list: {} slow duration = {}, slow count = {}",
+ LOG.trace("Transferring consumer {} to the abort list: {} slow duration = {}, slow count = {}",
new Object[]{ entry.getKey().getConsumerInfo().getConsumerId(),
entry.getValue().markCount * getCheckPeriod(),
entry.getValue().getSlowCount() });
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index ddf5709..ca165c0 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -1139,7 +1139,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
}
} catch (Exception e) {
- LOG.warn("failed to fire forward failure advisory, cause: {}", e);
+ LOG.warn("failed to fire forward failure advisory, cause: {}", (Object)e);
LOG.debug("detail", e);
}
}
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
index 9595aee..4a1a78c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
@@ -149,7 +149,7 @@ public abstract class DestinationBridge implements Service, MessageListener {
return;
} catch (Exception e) {
- LOG.info("failed to forward message on attempt: {} reason: {} message: {}", new Object[]{ attempt, e, message }, e);
+ LOG.info("failed to forward message on attempt: {} reason: {} message: {}", new Object[]{ attempt, e, message });
}
}
}
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
index fa46a0e..bef8d7f 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
@@ -259,7 +259,7 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
}
} else {
if (LOG.isTraceEnabled()) {
- LOG.trace("Message received since last read check, resetting flag: ");
+ LOG.trace("Message received since last read check, resetting flag: {}", this);
}
}
commandReceived.set(false);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
index fd42dc6..73cc0e6 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnection.java
@@ -191,7 +191,7 @@ public class MQTTWSConnection extends WebSocketAdapter implements WebSocketListe
try {
frame = (MQTTFrame)wireFormat.unmarshal(new ByteSequence(data, offset, length));
} catch (IOException e) {
- LOG.error("Could not decode incoming MQTT Frame: ", e.getMessage());
+ LOG.error("Could not decode incoming MQTT Frame: {}", e.getMessage());
connection.close();
}
@@ -245,7 +245,7 @@ public class MQTTWSConnection extends WebSocketAdapter implements WebSocketListe
connection.close();
}
} catch (Exception e) {
- LOG.error("Could not decode incoming MQTT Frame: ", e.getMessage());
+ LOG.error("Could not decode incoming MQTT Frame: {}", e.getMessage());
connection.close();
}
}
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
index 69c5295..c32134f 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
@@ -54,7 +54,7 @@ public class JmsPoolTestSupport {
brokerService.waitUntilStopped();
brokerService = null;
} catch (Exception ex) {
- LOG.warn("Suppress error on shutdown: {}", ex);
+ LOG.warn("Suppress error on shutdown: {}", (Object)ex);
}
}
diff --git a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
index d1cc80e..266d0b6 100644
--- a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
+++ b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
@@ -749,7 +749,7 @@ public class MQTTProtocolConverter {
if (response.isException()) {
Throwable error = ((ExceptionResponse) response).getException();
LOG.warn("Failed to send MQTT Publish: {}: {}", command, error.getMessage());
- LOG.trace("Error trace: {}", error);
+ LOG.trace("Error trace: {}", (Object)error);
}
switch (command.qos()) {
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index cf0be3e..d25decb 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -461,4 +461,4 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport implement
}
- }
+}
[activemq] 01/08: Utilize parameterized logging
Posted by jb...@apache.org.
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
commit a79a9453a110514cf24f9a37d2cbcf1da6df4125
Author: Daniel Trebbien <dt...@gmail.com>
AuthorDate: Sat Jul 29 10:42:56 2017 -0700
Utilize parameterized logging
(cherry picked from commit 210f583cbdbb5d992f0bfe561bf863b821ca402f)
---
.../test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
index 54a8eba..69c5295 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/JmsPoolTestSupport.java
@@ -43,7 +43,7 @@ public class JmsPoolTestSupport {
@Before
public void setUp() throws Exception {
- LOG.info("========== start " + getTestName() + " ==========");
+ LOG.info("========== start {} ==========", getTestName());
}
@After
@@ -58,7 +58,7 @@ public class JmsPoolTestSupport {
}
}
- LOG.info("========== tearDown " + getTestName() + " ==========");
+ LOG.info("========== tearDown {} ==========", getTestName());
}
public String getTestName() {