You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/06/12 16:41:00 UTC
[1/6] activemq-artemis git commit: ARTEMIS-127 Fixing
activemq-unit-tests pom version
Repository: activemq-artemis
Updated Branches:
refs/heads/master 145fc7f82 -> 29d59e970
ARTEMIS-127 Fixing activemq-unit-tests pom version
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/61895223
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/61895223
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/61895223
Branch: refs/heads/master
Commit: 61895223d07ebc58cde504bd57d3b95c0d27b677
Parents: 145fc7f
Author: Thiago Kronig <th...@gmail.com>
Authored: Wed Jun 10 13:22:08 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Thu Jun 11 23:58:12 2015 -0300
----------------------------------------------------------------------
tests/activemq5-unit-tests/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/61895223/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index d6d87e8..da44d3e 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq.tests</groupId>
<artifactId>artemis-tests-pom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>activemq5-unit-tests</artifactId>
[2/6] activemq-artemis git commit: ARTEMIS-127 Fixing sync on
non-final object for ArtemisBrokerWrapper
Posted by cl...@apache.org.
ARTEMIS-127 Fixing sync on non-final object for ArtemisBrokerWrapper
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/aab34e5b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/aab34e5b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/aab34e5b
Branch: refs/heads/master
Commit: aab34e5bd01757c3305691e80d7d3588e5ca0cbe
Parents: 6189522
Author: Thiago Kronig <th...@gmail.com>
Authored: Wed Jun 10 13:23:03 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Thu Jun 11 23:58:13 2015 -0300
----------------------------------------------------------------------
.../activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/aab34e5b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
index 86580e1..b739730 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
@@ -38,7 +38,7 @@ import org.apache.activemq.broker.BrokerService;
public class ArtemisBrokerWrapper extends ArtemisBrokerBase
{
- protected Map<String, SimpleString> testQueues = new HashMap<String, SimpleString>();
+ protected final Map<String, SimpleString> testQueues = new HashMap<String, SimpleString>();
public ArtemisBrokerWrapper(BrokerService brokerService)
{
[6/6] activemq-artemis git commit: This closes #26 error prone errors
and fixes on activemq5-tests
Posted by cl...@apache.org.
This closes #26 error prone errors and fixes on activemq5-tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/29d59e97
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/29d59e97
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/29d59e97
Branch: refs/heads/master
Commit: 29d59e970b0fbbe48533578875f5e59279351ccd
Parents: 145fc7f 4dd5408
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jun 12 10:38:24 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jun 12 10:38:24 2015 -0400
----------------------------------------------------------------------
tests/activemq5-unit-tests/pom.xml | 2 +-
.../artemiswrapper/ArtemisBrokerWrapper.java | 2 +-
.../JmsCreateConsumerInOnMessageTest.java | 6 +-
.../activemq/JmsMultipleClientsTestSupport.java | 4 +-
.../activemq/LargeMessageTestSupport.java | 8 +-
.../activemq/OnePrefetchAsyncConsumerTest.java | 2 +-
.../DbRestartJDBCQueueMasterSlaveLeaseTest.java | 2 +-
.../broker/policy/AbortSlowConsumer1Test.java | 4 +-
.../activemq/broker/region/QueuePurgeTest.java | 2 +-
.../region/QueueResendDuringShutdownTest.java | 4 +-
.../cursors/StoreQueueCursorOrderTest.java | 46 ++++----
.../broker/scheduler/JmsSchedulerTest.java | 8 +-
.../org/apache/activemq/bugs/AMQ2149Test.java | 114 ++++++++++---------
.../org/apache/activemq/bugs/AMQ2314Test.java | 2 +-
.../org/apache/activemq/bugs/AMQ3779Test.java | 2 +-
.../activemq/bugs/AMQ4485LowLimitTest.java | 8 +-
...XBrokersWithNDestsFanoutTransactionTest.java | 4 +-
.../org/apache/activemq/bugs/AMQ4607Test.java | 2 +-
.../org/apache/activemq/bugs/AMQ4636Test.java | 4 +-
.../activemq/bugs/AMQ5266SingleDestTest.java | 2 +-
.../org/apache/activemq/bugs/CraigsBugTest.java | 7 +-
.../bugs/TrapMessageInJDBCStoreTest.java | 4 +-
.../activemq/bugs/amq1974/TryJmsClient.java | 5 +-
.../activemq/bugs/amq1974/TryJmsManager.java | 5 +-
.../command/ActiveMQStreamMessageTest.java | 2 +-
.../command/ActiveMQTextMessageTest.java | 2 +-
.../apache/activemq/spring/ConsumerBean.java | 33 +++---
.../apache/activemq/spring/SpringConsumer.java | 8 +-
.../store/jdbc/JDBCIOExceptionHandlerTest.java | 12 +-
.../store/jdbc/JDBCMessagePriorityTest.java | 2 +-
.../store/jdbc/LeaseDatabaseLockerTest.java | 2 +-
.../store/kahadb/KahaDBFastEnqueueTest.java | 6 +-
.../activemq/store/kahadb/plist/PListTest.java | 10 +-
.../activemq/streams/JMSInputStreamTest.java | 2 +-
.../activemq/transport/StubTransport.java | 7 +-
.../activemq/transport/TopicClusterTest.java | 4 +-
.../transport/failover/AMQ1925Test.java | 27 ++---
.../activemq/transport/udp/UdpTestSupport.java | 6 +-
.../usecases/BacklogNetworkCrossTalkTest.java | 2 +-
.../BrokerQueueNetworkWithDisconnectTest.java | 2 +-
.../ConcurrentProducerDurableConsumerTest.java | 16 +--
.../ConcurrentProducerQueueConsumerTest.java | 16 +--
.../DurableSubscriptionOffline4Test.java | 3 +-
.../usecases/JdbcDurableSubDupTest.java | 2 +-
.../activemq/usecases/MemoryLimitTest.java | 4 +-
.../MessageGroupReconnectDistributionTest.java | 4 +-
.../usecases/MultiBrokersMultiClientsTest.java | 2 +-
.../usecases/NoDuplicateOnTopicNetworkTest.java | 2 +-
.../usecases/ReliableReconnectTest.java | 8 +-
...erTempDestDemandSubscriptionCleanupTest.java | 2 +-
.../VerifyNetworkConsumersDisconnectTest.java | 2 +-
.../org/apache/activemq/util/MessageIdList.java | 32 ++++--
52 files changed, 234 insertions(+), 235 deletions(-)
----------------------------------------------------------------------
[5/6] activemq-artemis git commit: ARTEMIS-127 Fix Array.toString(),
nonatomic update on volatiles
Posted by cl...@apache.org.
ARTEMIS-127 Fix Array.toString(), nonatomic update on volatiles
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4dd54080
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4dd54080
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4dd54080
Branch: refs/heads/master
Commit: 4dd54080a1e91463ad4b6693fb1e62ad3a81124a
Parents: ae6a2b8
Author: Thiago Kronig <th...@gmail.com>
Authored: Fri Jun 12 01:27:54 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Fri Jun 12 01:27:54 2015 -0300
----------------------------------------------------------------------
.../broker/policy/AbortSlowConsumer1Test.java | 4 +-
.../org/apache/activemq/bugs/AMQ2149Test.java | 112 ++++++++++---------
.../org/apache/activemq/bugs/AMQ3779Test.java | 2 +-
.../command/ActiveMQTextMessageTest.java | 2 +-
.../store/kahadb/KahaDBFastEnqueueTest.java | 4 +-
.../activemq/store/kahadb/plist/PListTest.java | 8 +-
.../activemq/transport/StubTransport.java | 7 +-
.../DurableSubscriptionOffline4Test.java | 3 +-
.../activemq/usecases/MemoryLimitTest.java | 4 +-
9 files changed, 78 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
index e17b362..4368f79 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumer1Test.java
@@ -82,7 +82,7 @@ public class AbortSlowConsumer1Test extends AbortSlowConsumerBase {
consumer.close();
TimeUnit.SECONDS.sleep(5);
- assertTrue("no exceptions : " + exceptions.toArray(), exceptions.isEmpty());
+ assertTrue("no exceptions : " + exceptions, exceptions.isEmpty());
}
@Test(timeout = 60 * 1000)
@@ -99,6 +99,6 @@ public class AbortSlowConsumer1Test extends AbortSlowConsumerBase {
conn.close();
TimeUnit.SECONDS.sleep(5);
- assertTrue("no exceptions : " + exceptions.toArray(), exceptions.isEmpty());
+ assertTrue("no exceptions : " + exceptions, exceptions.isEmpty());
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
index c28d3ad..f172a91 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
@@ -30,6 +30,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicLong;
import javax.jms.*;
@@ -65,22 +66,22 @@ public class AMQ2149Test {
private static final String BROKER_CONNECTOR = "tcp://localhost:61617";
private static final String DEFAULT_BROKER_URL = "failover:("+ BROKER_CONNECTOR
+")?maxReconnectDelay=1000&useExponentialBackOff=false";
-
+
private final String SEQ_NUM_PROPERTY = "seqNum";
final int MESSAGE_LENGTH_BYTES = 75 * 1024;
final long SLEEP_BETWEEN_SEND_MS = 25;
final int NUM_SENDERS_AND_RECEIVERS = 10;
final Object brokerLock = new Object();
-
+
private static final long DEFAULT_BROKER_STOP_PERIOD = 10 * 1000;
private static final long DEFAULT_NUM_TO_SEND = 1400;
-
+
long brokerStopPeriod = DEFAULT_BROKER_STOP_PERIOD;
long numtoSend = DEFAULT_NUM_TO_SEND;
long sleepBetweenSend = SLEEP_BETWEEN_SEND_MS;
String brokerURL = DEFAULT_BROKER_URL;
-
+
int numBrokerRestarts = 0;
final static int MAX_BROKER_RESTARTS = 4;
BrokerService broker;
@@ -88,15 +89,15 @@ public class AMQ2149Test {
protected File dataDirFile;
final LoggingBrokerPlugin[] plugins = new LoggingBrokerPlugin[]{new LoggingBrokerPlugin()};
-
-
+
+
public void createBroker(Configurer configurer) throws Exception {
broker = new BrokerService();
configurePersistenceAdapter(broker);
-
+
broker.getSystemUsage().getMemoryUsage().setLimit(MESSAGE_LENGTH_BYTES * 200 * NUM_SENDERS_AND_RECEIVERS);
- broker.addConnector(BROKER_CONNECTOR);
+ broker.addConnector(BROKER_CONNECTOR);
broker.setBrokerName(testName.getMethodName());
broker.setDataDirectoryFile(dataDirFile);
if (configurer != null) {
@@ -104,7 +105,7 @@ public class AMQ2149Test {
}
broker.start();
}
-
+
protected void configurePersistenceAdapter(BrokerService brokerService) throws Exception {
}
@@ -135,7 +136,7 @@ public class AMQ2149Test {
executor.shutdownNow();
exceptions.clear();
}
-
+
private String buildLongString() {
final StringBuilder stringBuilder = new StringBuilder(
MESSAGE_LENGTH_BYTES);
@@ -156,8 +157,8 @@ public class AMQ2149Test {
private final MessageConsumer messageConsumer;
- private volatile long nextExpectedSeqNum = 0;
-
+ private AtomicLong nextExpectedSeqNum = new AtomicLong();
+
private final boolean transactional;
private String lastId = null;
@@ -182,11 +183,11 @@ public class AMQ2149Test {
public void close() throws JMSException {
connection.close();
}
-
+
public long getNextExpectedSeqNo() {
- return nextExpectedSeqNum;
+ return nextExpectedSeqNum.get();
}
-
+
final int TRANSACITON_BATCH = 500;
boolean resumeOnNextOrPreviousIsOk = false;
public void onMessage(Message message) {
@@ -194,7 +195,7 @@ public class AMQ2149Test {
final long seqNum = message.getLongProperty(SEQ_NUM_PROPERTY);
if ((seqNum % TRANSACITON_BATCH) == 0) {
LOG.info(dest + " received " + seqNum);
-
+
if (transactional) {
LOG.info("committing..");
session.commit();
@@ -202,25 +203,26 @@ public class AMQ2149Test {
}
if (resumeOnNextOrPreviousIsOk) {
// after an indoubt commit we need to accept what we get (within reason)
- if (seqNum != nextExpectedSeqNum) {
- if (seqNum == nextExpectedSeqNum - (TRANSACITON_BATCH -1)) {
- nextExpectedSeqNum -= (TRANSACITON_BATCH -1);
+ if (seqNum != nextExpectedSeqNum.get()) {
+ final long l = nextExpectedSeqNum.get();
+ if (seqNum == l - (TRANSACITON_BATCH -1)) {
+ nextExpectedSeqNum.compareAndSet(l, l - (TRANSACITON_BATCH -1) );
LOG.info("In doubt commit failed, getting replay at:" + nextExpectedSeqNum);
}
}
resumeOnNextOrPreviousIsOk = false;
}
- if (seqNum != nextExpectedSeqNum) {
+ if (seqNum != nextExpectedSeqNum.get()) {
LOG.warn(dest + " received " + seqNum
+ " in msg: " + message.getJMSMessageID()
+ " expected "
+ nextExpectedSeqNum
- + ", lastId: " + lastId
+ + ", lastId: " + lastId
+ ", message:" + message);
fail(dest + " received " + seqNum + " expected "
+ nextExpectedSeqNum);
}
- ++nextExpectedSeqNum;
+ nextExpectedSeqNum.incrementAndGet();
lastId = message.getJMSMessageID();
} catch (TransactionRolledBackException expectedSometimesOnFailoverRecovery) {
LOG.info("got rollback: " + expectedSometimesOnFailoverRecovery);
@@ -228,12 +230,12 @@ public class AMQ2149Test {
// in doubt - either commit command or reply missing
// don't know if we will get a replay
resumeOnNextOrPreviousIsOk = true;
- nextExpectedSeqNum++;
+ nextExpectedSeqNum.incrementAndGet();
LOG.info("in doubt transaction completion: ok to get next or previous batch. next:" + nextExpectedSeqNum);
} else {
resumeOnNextOrPreviousIsOk = false;
// batch will be replayed
- nextExpectedSeqNum -= (TRANSACITON_BATCH -1);
+ nextExpectedSeqNum.addAndGet(-(TRANSACITON_BATCH - 1));
}
} catch (Throwable e) {
@@ -255,6 +257,7 @@ public class AMQ2149Test {
private final MessageProducer messageProducer;
private volatile long nextSequenceNumber = 0;
+ private final Object guard = new Object();
public Sender(javax.jms.Destination dest) throws JMSException {
this.dest = dest;
@@ -269,15 +272,24 @@ public class AMQ2149Test {
public void run() {
final String longString = buildLongString();
+ long nextSequenceNumber = this.nextSequenceNumber;
while (nextSequenceNumber < numtoSend) {
try {
final Message message = session
.createTextMessage(longString);
message.setLongProperty(SEQ_NUM_PROPERTY,
nextSequenceNumber);
- ++nextSequenceNumber;
- messageProducer.send(message);
-
+ synchronized (guard)
+ {
+ if (nextSequenceNumber == this.nextSequenceNumber)
+ {
+ this.nextSequenceNumber = nextSequenceNumber + 1;
+ messageProducer.send(message);
+ } else {
+ continue;
+ }
+ }
+
if ((nextSequenceNumber % 500) == 0) {
LOG.info(dest + " sent " + nextSequenceNumber);
}
@@ -353,13 +365,13 @@ public class AMQ2149Test {
// no need to run this unless there are some issues with the others
public void vanilaVerify_testOrder() throws Exception {
-
+
createBroker(new Configurer() {
public void configure(BrokerService broker) throws Exception {
- broker.deleteAllMessages();
+ broker.deleteAllMessages();
}
});
-
+
verifyOrderedMessageReceipt();
verifyStats(false);
}
@@ -368,22 +380,22 @@ public class AMQ2149Test {
public void testOrderWithRestart() throws Exception {
createBroker(new Configurer() {
public void configure(BrokerService broker) throws Exception {
- broker.deleteAllMessages();
+ broker.deleteAllMessages();
}
});
-
+
final Timer timer = new Timer();
schedualRestartTask(timer, new Configurer() {
- public void configure(BrokerService broker) throws Exception {
+ public void configure(BrokerService broker) throws Exception {
}
});
-
+
try {
verifyOrderedMessageReceipt();
} finally {
timer.cancel();
}
-
+
verifyStats(true);
}
@@ -394,16 +406,16 @@ public class AMQ2149Test {
broker.deleteAllMessages();
}
});
-
+
final Timer timer = new Timer();
schedualRestartTask(timer, null);
-
+
try {
verifyOrderedMessageReceipt(ActiveMQDestination.TOPIC_TYPE);
} finally {
timer.cancel();
}
-
+
verifyStats(true);
}
@@ -416,33 +428,33 @@ public class AMQ2149Test {
public void testTopicTransactionalOrderWithRestart() throws Exception {
doTestTransactionalOrderWithRestart(ActiveMQDestination.TOPIC_TYPE);
}
-
+
public void doTestTransactionalOrderWithRestart(byte destinationType) throws Exception {
numtoSend = 10000;
sleepBetweenSend = 3;
brokerStopPeriod = 10 * 1000;
-
+
createBroker(new Configurer() {
public void configure(BrokerService broker) throws Exception {
broker.deleteAllMessages();
}
});
-
+
final Timer timer = new Timer();
schedualRestartTask(timer, null);
-
+
try {
verifyOrderedMessageReceipt(destinationType, 1, true);
} finally {
timer.cancel();
}
-
+
verifyStats(true);
}
private void verifyStats(boolean brokerRestarts) throws Exception {
RegionBroker regionBroker = (RegionBroker) broker.getRegionBroker();
-
+
for (Destination dest : regionBroker.getQueueRegion().getDestinationMap().values()) {
DestinationStatistics stats = dest.getDestinationStatistics();
if (brokerRestarts) {
@@ -453,7 +465,7 @@ public class AMQ2149Test {
+ " " + stats.getEnqueues().getCount() + " <= " +stats.getDequeues().getCount());
} else {
assertEquals("qneue/dequeue match for: " + dest.getName(),
- stats.getEnqueues().getCount(), stats.getDequeues().getCount());
+ stats.getEnqueues().getCount(), stats.getDequeues().getCount());
}
}
}
@@ -496,20 +508,20 @@ public class AMQ2149Test {
}
return task;
}
-
+
private void verifyOrderedMessageReceipt(byte destinationType) throws Exception {
verifyOrderedMessageReceipt(destinationType, NUM_SENDERS_AND_RECEIVERS, false);
}
-
+
private void verifyOrderedMessageReceipt() throws Exception {
verifyOrderedMessageReceipt(ActiveMQDestination.QUEUE_TYPE, NUM_SENDERS_AND_RECEIVERS, false);
}
-
+
private void verifyOrderedMessageReceipt(byte destinationType, int concurrentPairs, boolean transactional) throws Exception {
Vector<Thread> threads = new Vector<Thread>();
Vector<Receiver> receivers = new Vector<Receiver>();
-
+
for (int i = 0; i < concurrentPairs; ++i) {
final javax.jms.Destination destination =
ActiveMQDestination.createDestination("test.dest." + i, destinationType);
@@ -518,7 +530,7 @@ public class AMQ2149Test {
thread.start();
threads.add(thread);
}
-
+
final long expiry = System.currentTimeMillis() + 1000 * 60 * 4;
while(!threads.isEmpty() && exceptions.isEmpty() && System.currentTimeMillis() < expiry) {
Thread sendThread = threads.firstElement();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3779Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3779Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3779Test.java
index 5a410e8..c7a486f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3779Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3779Test.java
@@ -47,7 +47,7 @@ public class AMQ3779Test extends AutoFailTestSupport {
}
}
};
- logger.getRootLogger().addAppender(appender);
+ Logger.getRootLogger().addAppender(appender);
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
index 28fc307..13c7184 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
@@ -49,7 +49,7 @@ public class ActiveMQTextMessageTest extends TestCase {
String string = "str";
msg.setText(string);
Message copy = msg.copy();
- assertTrue(msg.getText() == ((ActiveMQTextMessage) copy).getText());
+ assertSame(msg.getText(), ((ActiveMQTextMessage) copy).getText());
}
public void testSetText() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
index 57530da..4ccb51e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
@@ -238,8 +238,8 @@ public class KahaDBFastEnqueueTest {
public void testRollover() throws Exception {
byte flip = 0x1;
for (long i=0; i<Short.MAX_VALUE; i++) {
- assertEquals("0 @:" + i, 0, flip ^= 1);
- assertEquals("1 @:" + i, 1, flip ^= 1);
+ assertEquals("0 @:" + i, 0, flip ^= (byte) 1);
+ assertEquals("1 @:" + i, 1, flip ^= (byte) 1);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
index 71e4618..c62ee73 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
@@ -22,11 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Vector;
+import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -46,7 +42,7 @@ public class PListTest {
private PListStoreImpl store;
private PListImpl plist;
final ByteSequence payload = new ByteSequence(new byte[400]);
- final String idSeed = new String("Seed" + new byte[1024]);
+ final String idSeed = new String("Seed" + Arrays.toString(new byte[1024]));
final Vector<Throwable> exceptions = new Vector<Throwable>();
ExecutorService executor;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
index 8fb70ec..a11d45a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
@@ -19,6 +19,7 @@ package org.apache.activemq.transport;
import java.io.IOException;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.util.ServiceStopper;
@@ -29,7 +30,7 @@ import org.apache.activemq.util.ServiceStopper;
public class StubTransport extends TransportSupport {
private Queue<Object> queue = new ConcurrentLinkedQueue<Object>();
- private volatile int receiveCounter;
+ private AtomicInteger receiveCounter;
protected void doStop(ServiceStopper stopper) throws Exception {
}
@@ -38,7 +39,7 @@ public class StubTransport extends TransportSupport {
}
public void oneway(Object command) throws IOException {
- receiveCounter++;
+ receiveCounter.incrementAndGet();
queue.add(command);
}
@@ -51,7 +52,7 @@ public class StubTransport extends TransportSupport {
}
public int getReceiveCounter() {
- return receiveCounter;
+ return receiveCounter.get();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
index 09c50d0..bc31444 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOffline4Test.java
@@ -30,6 +30,7 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -80,7 +81,7 @@ public class DurableSubscriptionOffline4Test extends DurableSubscriptionOfflineT
MessageProducer producer = session.createProducer(null);
final int toSend = 500;
- final String payload = new byte[40*1024].toString();
+ final String payload = Arrays.toString(new byte[40 * 1024]);
int sent = 0;
for (int i = sent; i < toSend; i++) {
Message message = session.createTextMessage(payload);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4dd54080/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
index 49026bd..deb9cde 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
@@ -168,7 +168,7 @@ public class MemoryLimitTest extends TestSupport {
final ProducerThread producer = new ProducerThread(sess, sess.createQueue("STORE.1")) {
@Override
protected Message createMessage(int i) throws Exception {
- return sess.createTextMessage(payload + "::" + i);
+ return sess.createTextMessage(Arrays.toString(payload) + "::" + i);
}
};
producer.setMessageCount(1000);
@@ -176,7 +176,7 @@ public class MemoryLimitTest extends TestSupport {
final ProducerThread producer2 = new ProducerThread(sess, sess.createQueue("STORE.2")) {
@Override
protected Message createMessage(int i) throws Exception {
- return sess.createTextMessage(payload + "::" + i);
+ return sess.createTextMessage(Arrays.toString(payload) + "::" + i);
}
};
producer2.setMessageCount(1000);
[3/6] activemq-artemis git commit: ARTEMIS-127 Use L as suffix for
long constants
Posted by cl...@apache.org.
ARTEMIS-127 Use L as suffix for long constants
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/64ecb956
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/64ecb956
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/64ecb956
Branch: refs/heads/master
Commit: 64ecb9565dea42c7381e9a70a08339cafff7c960
Parents: aab34e5
Author: Thiago Kronig <th...@gmail.com>
Authored: Wed Jun 10 13:24:37 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Thu Jun 11 23:58:14 2015 -0300
----------------------------------------------------------------------
.../DbRestartJDBCQueueMasterSlaveLeaseTest.java | 2 +-
.../activemq/broker/region/QueuePurgeTest.java | 2 +-
.../cursors/StoreQueueCursorOrderTest.java | 46 ++++++++++----------
.../broker/scheduler/JmsSchedulerTest.java | 8 ++--
.../org/apache/activemq/bugs/AMQ2314Test.java | 2 +-
.../activemq/bugs/AMQ4485LowLimitTest.java | 8 ++--
...XBrokersWithNDestsFanoutTransactionTest.java | 4 +-
.../org/apache/activemq/bugs/AMQ4636Test.java | 4 +-
.../activemq/bugs/AMQ5266SingleDestTest.java | 2 +-
.../bugs/TrapMessageInJDBCStoreTest.java | 4 +-
.../command/ActiveMQStreamMessageTest.java | 2 +-
.../store/jdbc/JDBCIOExceptionHandlerTest.java | 12 ++---
.../store/jdbc/JDBCMessagePriorityTest.java | 2 +-
.../store/jdbc/LeaseDatabaseLockerTest.java | 2 +-
.../store/kahadb/KahaDBFastEnqueueTest.java | 2 +-
.../usecases/BacklogNetworkCrossTalkTest.java | 2 +-
.../BrokerQueueNetworkWithDisconnectTest.java | 2 +-
.../ConcurrentProducerDurableConsumerTest.java | 2 +-
.../ConcurrentProducerQueueConsumerTest.java | 2 +-
.../usecases/JdbcDurableSubDupTest.java | 2 +-
.../MessageGroupReconnectDistributionTest.java | 4 +-
...erTempDestDemandSubscriptionCleanupTest.java | 2 +-
22 files changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
index cf4929a..422b5ff 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
@@ -43,7 +43,7 @@ public class DbRestartJDBCQueueMasterSlaveLeaseTest extends DbRestartJDBCQueueMa
LeaseLockerIOExceptionHandler ioExceptionHandler = new LeaseLockerIOExceptionHandler();
ioExceptionHandler.setIgnoreSQLExceptions(false);
ioExceptionHandler.setStopStartConnectors(false);
- ioExceptionHandler.setResumeCheckSleepPeriod(500l);
+ ioExceptionHandler.setResumeCheckSleepPeriod(500L);
brokerService.setIoExceptionHandler(ioExceptionHandler);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
index 9120937..d02085a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
@@ -67,7 +67,7 @@ public class QueuePurgeTest extends CombinationTestSupport {
broker.setDataDirectoryFile(testDataDir);
broker.setUseJmx(true);
broker.setDeleteAllMessagesOnStartup(true);
- broker.getSystemUsage().getMemoryUsage().setLimit(1024l*1024*64);
+ broker.getSystemUsage().getMemoryUsage().setLimit(1024L*1024*64);
KahaDBPersistenceAdapter persistenceAdapter = new KahaDBPersistenceAdapter();
persistenceAdapter.setDirectory(new File(testDataDir, "kahadb"));
broker.setPersistenceAdapter(persistenceAdapter);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
index f8fab10..e5431c0 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorOrderTest.java
@@ -106,7 +106,7 @@ public class StoreQueueCursorOrderTest {
@Override
public void run() {
}
- }, 2l) {};
+ }, 2L) {};
msg.getMessageId().setFutureOrSequenceLong(future);
underTest.addMessageLast(msg);
@@ -116,12 +116,12 @@ public class StoreQueueCursorOrderTest {
msg = getMessage(1);
messages[0] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(1l);
+ msg.getMessageId().setFutureOrSequenceLong(1L);
underTest.addMessageLast(msg);
assertTrue("cache is disabled as limit reached", !underTest.isCacheEnabled());
- assertEquals("setBatch unset", 0l, queueMessageStore.batch.get());
+ assertEquals("setBatch unset", 0L, queueMessageStore.batch.get());
int dequeueCount = 0;
@@ -171,9 +171,9 @@ public class StoreQueueCursorOrderTest {
FutureTask<Long> future = new FutureTask<Long>(new Runnable() {
@Override
public void run() {
- msgRef.getMessageId().setFutureOrSequenceLong(1l);
+ msgRef.getMessageId().setFutureOrSequenceLong(1L);
}
- }, 1l) {};
+ }, 1L) {};
msg.getMessageId().setFutureOrSequenceLong(future);
Executors.newSingleThreadExecutor().submit(future);
underTest.addMessageLast(msg);
@@ -184,12 +184,12 @@ public class StoreQueueCursorOrderTest {
msg = getMessage(1);
messages[0] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(1l);
+ msg.getMessageId().setFutureOrSequenceLong(1L);
underTest.addMessageLast(msg);
assertTrue("cache is disabled as limit reached", !underTest.isCacheEnabled());
- assertEquals("setBatch unset", 0l, queueMessageStore.batch.get());
+ assertEquals("setBatch unset", 0L, queueMessageStore.batch.get());
int dequeueCount = 0;
@@ -239,9 +239,9 @@ public class StoreQueueCursorOrderTest {
FutureTask<Long> future = new FutureTask<Long>(new Runnable() {
@Override
public void run() {
- msgRef.getMessageId().setFutureOrSequenceLong(0l);
+ msgRef.getMessageId().setFutureOrSequenceLong(0L);
}
- }, 0l) {};
+ }, 0L) {};
msg.getMessageId().setFutureOrSequenceLong(future);
Executors.newSingleThreadExecutor().submit(future);
underTest.addMessageLast(msg);
@@ -257,16 +257,16 @@ public class StoreQueueCursorOrderTest {
FutureTask<Long> future2 = new FutureTask<Long>(new Runnable() {
@Override
public void run() {
- msgRe2f.getMessageId().setFutureOrSequenceLong(1l);
+ msgRe2f.getMessageId().setFutureOrSequenceLong(1L);
}
- }, 1l) {};
+ }, 1L) {};
msg.getMessageId().setFutureOrSequenceLong(future2);
Executors.newSingleThreadExecutor().submit(future2);
underTest.addMessageLast(msg);
assertTrue("cache is disabled as limit reached", !underTest.isCacheEnabled());
- assertEquals("setBatch set", 1l, queueMessageStore.batch.get());
+ assertEquals("setBatch set", 1L, queueMessageStore.batch.get());
int dequeueCount = 0;
@@ -316,9 +316,9 @@ public class StoreQueueCursorOrderTest {
FutureTask<Long> future0 = new FutureTask<Long>(new Runnable() {
@Override
public void run() {
- msgRef.getMessageId().setFutureOrSequenceLong(0l);
+ msgRef.getMessageId().setFutureOrSequenceLong(0L);
}
- }, 0l) {};
+ }, 0L) {};
msg.getMessageId().setFutureOrSequenceLong(future0);
underTest.addMessageLast(msg);
Executors.newSingleThreadExecutor().submit(future0);
@@ -332,9 +332,9 @@ public class StoreQueueCursorOrderTest {
FutureTask<Long> future1 = new FutureTask<Long>(new Runnable() {
@Override
public void run() {
- msgRef1.getMessageId().setFutureOrSequenceLong(3l);
+ msgRef1.getMessageId().setFutureOrSequenceLong(3L);
}
- }, 3l) {};
+ }, 3L) {};
msg.getMessageId().setFutureOrSequenceLong(future1);
underTest.addMessageLast(msg);
@@ -342,7 +342,7 @@ public class StoreQueueCursorOrderTest {
msg = getMessage(2);
messages[1] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(1l);
+ msg.getMessageId().setFutureOrSequenceLong(1L);
underTest.addMessageLast(msg);
assertTrue("cache enabled", underTest.isUseCache() && underTest.isCacheEnabled());
@@ -354,12 +354,12 @@ public class StoreQueueCursorOrderTest {
msg = getMessage(3);
messages[2] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(3l);
+ msg.getMessageId().setFutureOrSequenceLong(3L);
underTest.addMessageLast(msg);
assertTrue("cache is disabled as limit reached", !underTest.isCacheEnabled());
- assertEquals("setBatch set", 2l, queueMessageStore.batch.get());
+ assertEquals("setBatch set", 2L, queueMessageStore.batch.get());
int dequeueCount = 0;
@@ -405,13 +405,13 @@ public class StoreQueueCursorOrderTest {
ActiveMQTextMessage msg = getMessage(0);
messages[0] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(0l);
+ msg.getMessageId().setFutureOrSequenceLong(0L);
underTest.addMessageLast(msg);
msg = getMessage(1);
messages[1] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(1l);
+ msg.getMessageId().setFutureOrSequenceLong(1L);
underTest.addMessageLast(msg);
assertTrue("cache enabled", underTest.isUseCache() && underTest.isCacheEnabled());
@@ -419,12 +419,12 @@ public class StoreQueueCursorOrderTest {
msg = getMessage(2);
messages[2] = msg;
msg.setMemoryUsage(systemUsage.getMemoryUsage());
- msg.getMessageId().setFutureOrSequenceLong(2l);
+ msg.getMessageId().setFutureOrSequenceLong(2L);
underTest.addMessageLast(msg);
assertTrue("cache is disabled as limit reached", !underTest.isCacheEnabled());
- assertEquals("setBatch set", 2l, queueMessageStore.batch.get());
+ assertEquals("setBatch set", 2L, queueMessageStore.batch.get());
int dequeueCount = 0;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
index 0ce584d..41b0f0d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
@@ -260,7 +260,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
// wait for the producer to block, which should happen immediately, and also wait long
// enough for the delay to elapse. We should see no deliveries as the send should block
// on the first message.
- Thread.sleep(10000l);
+ Thread.sleep(10000L);
assertEquals(100, latch.getCount());
@@ -268,7 +268,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
broker.getSystemUsage().getJobSchedulerUsage().setLimit(1024 * 1024 * 33);
// Wait long enough that the messages are enqueued and the delivery delay has elapsed.
- Thread.sleep(10000l);
+ Thread.sleep(10000L);
// Make sure we sent all the messages we expected to send
Wait.waitFor(new Wait.Condition() {
@@ -276,12 +276,12 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
public boolean isSatisified() throws Exception {
return producer.getSentCount() == producer.getMessageCount();
}
- }, 20000l);
+ }, 20000L);
assertEquals("Producer didn't send all messages", producer.getMessageCount(), producer.getSentCount());
// Make sure we got all the messages we expected to get
- latch.await(20000l, TimeUnit.MILLISECONDS);
+ latch.await(20000L, TimeUnit.MILLISECONDS);
assertEquals("Consumer did not receive all messages.", 0, latch.getCount());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java
index 369385c..08be5db 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java
@@ -157,7 +157,7 @@ public class AMQ2314Test extends CombinationTestSupport {
broker.setUseJmx(true);
broker.setAdvisorySupport(false);
broker.setDeleteAllMessagesOnStartup(true);
- broker.getSystemUsage().getMemoryUsage().setLimit(1024l*1024*64);
+ broker.getSystemUsage().getMemoryUsage().setLimit(1024L*1024*64);
broker.addConnector("tcp://localhost:0").setName("Default");
broker.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
index 21c389f..7c549b4 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
@@ -101,14 +101,14 @@ public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport {
addNetworkConnector(broker);
}
broker.setSchedulePeriodForDestinationPurge(0);
- broker.getSystemUsage().getMemoryUsage().setLimit(256 * 1024 * 1024l);
+ broker.getSystemUsage().getMemoryUsage().setLimit(256 * 1024 * 1024L);
PolicyMap policyMap = new PolicyMap();
PolicyEntry policyEntry = new PolicyEntry();
policyEntry.setExpireMessagesPeriod(0);
policyEntry.setQueuePrefetch(1000);
- policyEntry.setMemoryLimit(2 * 1024 * 1024l);
+ policyEntry.setMemoryLimit(2 * 1024 * 1024L);
policyEntry.setProducerFlowControl(false);
policyEntry.setEnableAudit(true);
policyEntry.setUseCache(true);
@@ -117,7 +117,7 @@ public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport {
PolicyEntry inPolicyEntry = new PolicyEntry();
inPolicyEntry.setExpireMessagesPeriod(0);
inPolicyEntry.setQueuePrefetch(1000);
- inPolicyEntry.setMemoryLimit(5 * 1024 * 1024l);
+ inPolicyEntry.setMemoryLimit(5 * 1024 * 1024L);
inPolicyEntry.setProducerFlowControl(true);
inPolicyEntry.setEnableAudit(true);
inPolicyEntry.setUseCache(true);
@@ -252,7 +252,7 @@ public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport {
}
return true;
}
- }, 1000 * 60 * 1000l, 20*1000));
+ }, 1000 * 60 * 1000L, 20*1000));
assertTrue("No exceptions:" + exceptions, exceptions.isEmpty());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
index c2cf53a..8e4e4b7 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java
@@ -98,7 +98,7 @@ public class AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest extends Jms
PolicyEntry policyEntry = new PolicyEntry();
policyEntry.setExpireMessagesPeriod(0);
policyEntry.setQueuePrefetch(1000);
- policyEntry.setMemoryLimit(1024 * 1024l);
+ policyEntry.setMemoryLimit(1024 * 1024L);
policyEntry.setOptimizedDispatch(false);
policyEntry.setProducerFlowControl(false);
policyEntry.setEnableAudit(true);
@@ -171,7 +171,7 @@ public class AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest extends Jms
}
return true;
}
- }, 1000 * 60 * 1000l));
+ }, 1000 * 60 * 1000L));
assertTrue("No exceptions:" + exceptions, exceptions.isEmpty());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
index b9246fb..1e0ccb9 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java
@@ -101,9 +101,9 @@ public class AMQ4636Test {
JDBCPersistenceAdapter jdbc = new TestJDBCPersistenceAdapter();
jdbc.setDataSource(embeddedDataSource);
- jdbc.setLockKeepAlivePeriod(1000l);
+ jdbc.setLockKeepAlivePeriod(1000L);
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
- leaseDatabaseLocker.setLockAcquireSleepInterval(2000l);
+ leaseDatabaseLocker.setLockAcquireSleepInterval(2000L);
jdbc.setLocker(leaseDatabaseLocker);
broker = new BrokerService();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
index 0d7f44b..ba7ee4d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
@@ -227,7 +227,7 @@ public class AMQ5266SingleDestTest {
}
// verify empty dlq
- assertEquals("No pending messages", 0l, ((RegionBroker) brokerService.getRegionBroker()).getDestinationStatistics().getMessages().getCount());
+ assertEquals("No pending messages", 0L, ((RegionBroker) brokerService.getRegionBroker()).getDestinationStatistics().getMessages().getCount());
}
public class ExportQueuePublisher {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
index 688d066..ad6df7f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TrapMessageInJDBCStoreTest.java
@@ -82,9 +82,9 @@ public class TrapMessageInJDBCStoreTest extends TestCase {
jdbc.setCleanupPeriod(0);
testTransactionContext = new TestTransactionContext(jdbc);
- jdbc.setLockKeepAlivePeriod(1000l);
+ jdbc.setLockKeepAlivePeriod(1000L);
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
- leaseDatabaseLocker.setLockAcquireSleepInterval(2000l);
+ leaseDatabaseLocker.setLockAcquireSleepInterval(2000L);
jdbc.setLocker(leaseDatabaseLocker);
broker.setPersistenceAdapter(jdbc);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
index 9e0f468..e042217 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
@@ -979,7 +979,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
message.writeObject(new Byte((byte) 2));
message.writeObject(new Short((short) 2));
message.writeObject(new Integer(2));
- message.writeObject(new Long(2l));
+ message.writeObject(new Long(2L));
message.writeObject(new Float(2.0f));
message.writeObject(new Double(2.0d));
}catch(Exception e) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
index df10d73..2502110 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
@@ -71,17 +71,17 @@ public class JDBCIOExceptionHandlerTest extends TestCase {
JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
jdbc.setDataSource(dataSource);
- jdbc.setLockKeepAlivePeriod(1000l);
+ jdbc.setLockKeepAlivePeriod(1000L);
if (leaseLocker) {
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
leaseDatabaseLocker.setHandleStartException(true);
- leaseDatabaseLocker.setLockAcquireSleepInterval(2000l);
+ leaseDatabaseLocker.setLockAcquireSleepInterval(2000L);
jdbc.setLocker(leaseDatabaseLocker);
}
broker.setPersistenceAdapter(jdbc);
LeaseLockerIOExceptionHandler ioExceptionHandler = new LeaseLockerIOExceptionHandler();
- ioExceptionHandler.setResumeCheckSleepPeriod(1000l);
+ ioExceptionHandler.setResumeCheckSleepPeriod(1000L);
ioExceptionHandler.setStopStartConnectors(startStopConnectors);
broker.setIoExceptionHandler(ioExceptionHandler);
String connectionUri = broker.addConnector(TRANSPORT_URL).getPublishableConnectString();
@@ -129,18 +129,18 @@ public class JDBCIOExceptionHandlerTest extends TestCase {
JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
jdbc.setDataSource(dataSource);
- jdbc.setLockKeepAlivePeriod(1000l);
+ jdbc.setLockKeepAlivePeriod(1000L);
if (lease) {
LeaseDatabaseLocker leaseDatabaseLocker = new LeaseDatabaseLocker();
leaseDatabaseLocker.setHandleStartException(true);
- leaseDatabaseLocker.setLockAcquireSleepInterval(2000l);
+ leaseDatabaseLocker.setLockAcquireSleepInterval(2000L);
jdbc.setLocker(leaseDatabaseLocker);
}
broker.setPersistenceAdapter(jdbc);
LeaseLockerIOExceptionHandler ioExceptionHandler = new LeaseLockerIOExceptionHandler();
- ioExceptionHandler.setResumeCheckSleepPeriod(1000l);
+ ioExceptionHandler.setResumeCheckSleepPeriod(1000L);
ioExceptionHandler.setStopStartConnectors(false);
broker.setIoExceptionHandler(ioExceptionHandler);
slave.set(broker);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
index 34796a4..2399738 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
@@ -150,7 +150,7 @@ public class JDBCMessagePriorityTest extends MessagePriorityTest {
for (int priority = 0; priority < maxPriority; priority++) {
producers.add(new ProducerThread(topic, MSG_NUM, priority));
messageCounts[priority] = new AtomicInteger(0);
- messageIds[priority] = 1l;
+ messageIds[priority] = 1L;
}
for (ProducerThread producer : producers) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
index 774d172..6042ae6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
@@ -188,7 +188,7 @@ public class LeaseDatabaseLockerTest {
statement = connection.prepareStatement(jdbc.getStatements().getLeaseUpdateStatement());
statement.setString(1, null);
- statement.setLong(2, 0l);
+ statement.setLong(2, 0L);
statement.setString(3, fakeId);
assertEquals("we released " + fakeId, 1, statement.executeUpdate());
LOG.info("released " + fakeId);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
index 15abe3d..57530da 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
@@ -189,7 +189,7 @@ public class KahaDBFastEnqueueTest {
MessageProducer producer = session.createProducer(destination);
Long start = System.currentTimeMillis();
- long i = 0l;
+ long i = 0L;
while ( (i=count.getAndDecrement()) > 0) {
Message message = null;
if (useBytesMessage) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
index 3e9b913..b56c5b0 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
@@ -69,7 +69,7 @@ public class BacklogNetworkCrossTalkTest extends JmsMultipleBrokersTestSupport {
MessageConsumer clientB = createConsumer("B", destA);
- final long maxWait = 5 * 60 * 1000l;
+ final long maxWait = 5 * 60 * 1000L;
MessageIdList listA = getConsumerMessages("A", clientA);
listA.setMaximumDuration(maxWait);
listA.waitForMessagesToArrive(numMessages);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
index 0b8de29..e32a1bc 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
@@ -88,7 +88,7 @@ public class BrokerQueueNetworkWithDisconnectTest extends JmsMultipleBrokersTest
@SuppressWarnings("unchecked")
public void testNoStuckConnectionsWithTransportDisconnect() throws Exception {
- inactiveDuration=60000l;
+ inactiveDuration=60000L;
useDuplexNetworkBridge = true;
bridgeBrokers(SPOKE, HUB);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
index a5233ee..e1035a6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
@@ -405,7 +405,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
final int batchSize = 1000;
CountDownLatch firstReceiptLatch = new CountDownLatch(1);
long mark = System.currentTimeMillis();
- long firstReceipt = 0l;
+ long firstReceipt = 0L;
long receiptAccumulator = 0;
long batchReceiptAccumulator = 0;
long maxReceiptTime = 0;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
index e9e3b54..34807c6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
@@ -362,7 +362,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
final CountDownLatch firstReceiptLatch = new CountDownLatch(1);
long mark = System.currentTimeMillis();
- long firstReceipt = 0l;
+ long firstReceipt = 0L;
long receiptAccumulator = 0;
long batchReceiptAccumulator = 0;
long maxReceiptTime = 0;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
index 0cb2648..1b3be06 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
@@ -239,7 +239,7 @@ public class JdbcDurableSubDupTest {
ActiveMQConnectionFactory factory;
MessageProducer messageProducer;
- long timeToLive = 0l;
+ long timeToLive = 0L;
TextMessage message = null;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java
index da2f367..bbc3a7a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MessageGroupReconnectDistributionTest.java
@@ -122,8 +122,8 @@ public class MessageGroupReconnectDistributionTest {
final ArrayList<AtomicLong> batchCounters = new ArrayList<AtomicLong>(numConsumers);
for (int i = 0; i < numConsumers; i++) {
- consumedCounters.add(new AtomicLong(0l));
- batchCounters.add(new AtomicLong(0l));
+ consumedCounters.add(new AtomicLong(0L));
+ batchCounters.add(new AtomicLong(0L));
final int id = i;
executorService.submit(new Runnable() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/64ecb956/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTempDestDemandSubscriptionCleanupTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTempDestDemandSubscriptionCleanupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTempDestDemandSubscriptionCleanupTest.java
index 08435df..aa1b89b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTempDestDemandSubscriptionCleanupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTempDestDemandSubscriptionCleanupTest.java
@@ -122,7 +122,7 @@ public class ThreeBrokerTempDestDemandSubscriptionCleanupTest extends JmsMultipl
threadService.submit(tester);
threadService.shutdown();
- assertTrue("executor done on time", threadService.awaitTermination(30l, TimeUnit.SECONDS));
+ assertTrue("executor done on time", threadService.awaitTermination(30L, TimeUnit.SECONDS));
// for the real test... we should not have any subscriptions left on broker C for the temp dests
BrokerItem brokerC = brokers.get(BROKER_C);
[4/6] activemq-artemis git commit: ARTEMIS-127 Fix some concurrency
idioms for ActimeMQ Tests
Posted by cl...@apache.org.
ARTEMIS-127 Fix some concurrency idioms for ActimeMQ Tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ae6a2b87
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ae6a2b87
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ae6a2b87
Branch: refs/heads/master
Commit: ae6a2b87eaa9325d2437db2ccd5152f6db0d2ad3
Parents: 64ecb95
Author: Thiago Kronig <th...@gmail.com>
Authored: Wed Jun 10 20:37:58 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Fri Jun 12 00:30:23 2015 -0300
----------------------------------------------------------------------
.../JmsCreateConsumerInOnMessageTest.java | 6 ++--
.../activemq/JmsMultipleClientsTestSupport.java | 4 +--
.../activemq/LargeMessageTestSupport.java | 8 ++---
.../activemq/OnePrefetchAsyncConsumerTest.java | 2 +-
.../region/QueueResendDuringShutdownTest.java | 4 +--
.../org/apache/activemq/bugs/AMQ2149Test.java | 2 +-
.../org/apache/activemq/bugs/AMQ4607Test.java | 2 +-
.../org/apache/activemq/bugs/CraigsBugTest.java | 7 +++--
.../activemq/bugs/amq1974/TryJmsClient.java | 5 ++-
.../activemq/bugs/amq1974/TryJmsManager.java | 5 ++-
.../apache/activemq/spring/ConsumerBean.java | 33 +++++++++++---------
.../apache/activemq/spring/SpringConsumer.java | 8 ++---
.../activemq/store/kahadb/plist/PListTest.java | 2 +-
.../activemq/streams/JMSInputStreamTest.java | 2 +-
.../activemq/transport/TopicClusterTest.java | 4 +--
.../transport/failover/AMQ1925Test.java | 27 +++++-----------
.../activemq/transport/udp/UdpTestSupport.java | 6 ++--
.../ConcurrentProducerDurableConsumerTest.java | 14 +++------
.../ConcurrentProducerQueueConsumerTest.java | 14 +++------
.../usecases/MultiBrokersMultiClientsTest.java | 2 +-
.../usecases/NoDuplicateOnTopicNetworkTest.java | 2 +-
.../usecases/ReliableReconnectTest.java | 8 ++---
.../VerifyNetworkConsumersDisconnectTest.java | 2 +-
.../org/apache/activemq/util/MessageIdList.java | 32 ++++++++++++-------
24 files changed, 95 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
index 7a219e2..c0a4f5f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
@@ -36,7 +36,7 @@ public class JmsCreateConsumerInOnMessageTest extends TestSupport implements Mes
private MessageConsumer testConsumer;
private MessageProducer producer;
private Topic topic;
- private Object lock = new Object();
+ private final Object lock = new Object();
/*
* @see junit.framework.TestCase#setUp()
@@ -71,8 +71,8 @@ public class JmsCreateConsumerInOnMessageTest extends TestSupport implements Mes
public void testCreateConsumer() throws Exception {
Message msg = super.createMessage();
producer.send(msg);
- if (testConsumer == null) {
- synchronized (lock) {
+ synchronized (lock) {
+ while(testConsumer == null) {
lock.wait(3000);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
index 5eaab8d..5c73a6e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
@@ -83,8 +83,6 @@ public class JmsMultipleClientsTestSupport {
protected List<Connection> connections = Collections.synchronizedList(new ArrayList<Connection>());
protected MessageIdList allMessagesList = new MessageIdList();
- private AtomicInteger producerLock;
-
protected void startProducers(Destination dest, int msgCount) throws Exception {
startProducers(createConnectionFactory(), dest, msgCount);
}
@@ -92,7 +90,7 @@ public class JmsMultipleClientsTestSupport {
protected void startProducers(final ConnectionFactory factory, final Destination dest, final int msgCount) throws Exception {
// Use concurrent send
if (useConcurrentSend) {
- producerLock = new AtomicInteger(producerCount);
+ final AtomicInteger producerLock = new AtomicInteger(producerCount);
for (int i = 0; i < producerCount; i++) {
Thread t = new Thread(new Runnable() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeMessageTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeMessageTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeMessageTestSupport.java
index fc77218..d1ab8a5 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeMessageTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/LargeMessageTestSupport.java
@@ -61,7 +61,7 @@ public class LargeMessageTestSupport extends ClientTestSupport implements Messag
protected int deliveryMode = DeliveryMode.PERSISTENT;
protected IdGenerator idGen = new IdGenerator();
protected boolean validMessageConsumption = true;
- protected AtomicInteger messageCount = new AtomicInteger(0);
+ protected final AtomicInteger messageCount = new AtomicInteger(0);
protected int prefetchValue = 10000000;
@@ -182,9 +182,9 @@ public class LargeMessageTestSupport extends ClientTestSupport implements Messag
producer.send(msg);
}
long now = System.currentTimeMillis();
- while (now + 60000 > System.currentTimeMillis() && messageCount.get() < MESSAGE_COUNT) {
- LOG.info("message count = " + messageCount);
- synchronized (messageCount) {
+ synchronized (messageCount) {
+ while (now + 60000 > System.currentTimeMillis() && messageCount.get() < MESSAGE_COUNT) {
+ LOG.info("message count = " + messageCount);
messageCount.wait(1000);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
index 0851198..26c6bf1 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
@@ -154,7 +154,7 @@ public class OnePrefetchAsyncConsumerTest extends EmbeddedBrokerTestSupport {
}
private class TestServerSession implements ServerSession {
- TestServerSessionPool pool;
+ final TestServerSessionPool pool;
Session session;
public TestServerSession(TestServerSessionPool pool) throws JMSException {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
index 0439fa8..c7154a9 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java
@@ -54,7 +54,7 @@ public class QueueResendDuringShutdownTest {
private Connection producerConnection;
private Queue queue;
- private Object messageReceiveSync = new Object();
+ private final Object messageReceiveSync = new Object();
private int receiveCount;
@Before
@@ -239,7 +239,7 @@ public class QueueResendDuringShutdownTest {
protected void waitForMessage (long delayMs) {
try {
synchronized ( this.messageReceiveSync ) {
- if ( this.receiveCount == 0 ) {
+ while ( this.receiveCount == 0 ) {
this.messageReceiveSync.wait(delayMs);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
index b2eba61..c28d3ad 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
@@ -563,7 +563,7 @@ public class AMQ2149Test {
}
class TeardownTask implements Callable<Boolean> {
- private Object brokerLock;
+ private final Object brokerLock;
private BrokerService broker;
public TeardownTask(Object brokerLock, BrokerService broker) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
index 265b692..b567c93 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4607Test.java
@@ -49,7 +49,7 @@ public class AMQ4607Test extends JmsMultipleBrokersTestSupport implements Uncaug
public boolean duplex = true;
protected Map<String, MessageConsumer> consumerMap;
- Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>();
+ final Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>();
private void assertNoUnhandeledExceptions() {
for( Entry<Thread, Throwable> e: unhandeledExceptions.entrySet()) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java
index f956da6..d71a9e4 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/CraigsBugTest.java
@@ -25,6 +25,9 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
public class CraigsBugTest extends EmbeddedBrokerTestSupport {
private String connectionUri;
@@ -49,9 +52,7 @@ public class CraigsBugTest extends EmbeddedBrokerTestSupport {
conn.start();
try {
- synchronized (this) {
- wait(3000);
- }
+ new CountDownLatch(1).await(3, TimeUnit.SECONDS);
} catch (InterruptedException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
index c8b4503..1f25109 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
@@ -25,6 +25,7 @@ import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
import javax.jms.*;
import java.io.File;
import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
public class TryJmsClient
{
@@ -59,9 +60,7 @@ public class TryJmsClient
startMessageSend();
- synchronized(this) {
- this.wait();
- }
+ new CountDownLatch(1).await();
}
private void startUsageMonitor(final BrokerService brokerService) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
index 3f58987..c8eb7b3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
@@ -25,6 +25,7 @@ import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
import javax.jms.*;
import java.io.File;
import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
public class TryJmsManager {
@@ -59,9 +60,7 @@ public class TryJmsManager {
startMessageConsumer();
- synchronized(this) {
- this.wait();
- }
+ new CountDownLatch(1).await();
}
private void startUsageMonitor(final BrokerService brokerService) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java
index 8f22c33..4e1ab59 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/ConsumerBean.java
@@ -73,14 +73,19 @@ public class ConsumerBean extends Assert implements MessageListener {
long start = System.currentTimeMillis();
- try {
- if (hasReceivedMessage()) {
- synchronized (messages) {
+ synchronized(messages)
+ {
+ try
+ {
+ while (hasReceivedMessage())
+ {
messages.wait(4000);
}
}
- } catch (InterruptedException e) {
- LOG.info("Caught: " + e);
+ catch (InterruptedException e)
+ {
+ LOG.info("Caught: " + e);
+ }
}
long end = System.currentTimeMillis() - start;
@@ -101,18 +106,18 @@ public class ConsumerBean extends Assert implements MessageListener {
LOG.info("Waiting for (" + maxRemainingMessageCount + ") message(s) to arrive");
long start = System.currentTimeMillis();
long endTime = start + maxWaitTime;
- while (maxRemainingMessageCount > 0) {
- try {
- synchronized (messages) {
+ synchronized (messages) {
+ while (maxRemainingMessageCount > 0) {
+ try {
messages.wait(1000);
+ if (hasReceivedMessages(messageCount) || System.currentTimeMillis() > endTime) {
+ break;
+ }
+ } catch (InterruptedException e) {
+ LOG.info("Caught: " + e);
}
- if (hasReceivedMessages(messageCount) || System.currentTimeMillis() > endTime) {
- break;
- }
- } catch (InterruptedException e) {
- LOG.info("Caught: " + e);
+ maxRemainingMessageCount = Math.max(0, messageCount - messages.size());
}
- maxRemainingMessageCount = Math.max(0, messageCount - messages.size());
}
long end = System.currentTimeMillis() - start;
LOG.info("End of wait for " + end + " millis");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/SpringConsumer.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/SpringConsumer.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/SpringConsumer.java
index 118e036..ed0a48a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/SpringConsumer.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/spring/SpringConsumer.java
@@ -43,13 +43,13 @@ public class SpringConsumer extends ConsumerBean implements MessageListener {
try {
ConnectionFactory factory = template.getConnectionFactory();
- connection = factory.createConnection();
+ final Connection c = connection = factory.createConnection();
// we might be a reusable connection in spring
// so lets only set the client ID once if its not set
- synchronized (connection) {
- if (connection.getClientID() == null) {
- connection.setClientID(myId);
+ synchronized (c) {
+ if (c.getClientID() == null) {
+ c.setClientID(myId);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
index 555503e..71e4618 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
@@ -617,7 +617,7 @@ public class PListTest {
}
}
- Map<PList, Object> locks = new HashMap<PList, Object>();
+ final Map<PList, Object> locks = new HashMap<PList, Object>();
private Object plistLocks(PList plist) {
Object lock = null;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java
index f392662..b07c8cc 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java
@@ -250,7 +250,7 @@ public class JMSInputStreamTest extends JmsTestSupport {
}
out.flush();
synchronized (complete) {
- if (!complete.get()) {
+ while (!complete.get()) {
complete.wait(30000);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
index 4db7c23..26c215a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
@@ -55,7 +55,7 @@ public class TopicClusterTest extends TestCase implements MessageListener {
protected Destination destination;
protected boolean topic = true;
- protected AtomicInteger receivedMessageCount = new AtomicInteger(0);
+ protected final AtomicInteger receivedMessageCount = new AtomicInteger(0);
protected int deliveryMode = DeliveryMode.NON_PERSISTENT;
protected MessageProducer[] producers;
protected Connection[] connections;
@@ -166,7 +166,7 @@ public class TopicClusterTest extends TestCase implements MessageListener {
}
}
synchronized (receivedMessageCount) {
- if (receivedMessageCount.get() < expectedReceiveCount()) {
+ while (receivedMessageCount.get() < expectedReceiveCount()) {
receivedMessageCount.wait(20000);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
index dfb5dfd..d03dbcd 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
@@ -21,6 +21,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.jms.Connection;
@@ -73,14 +74,12 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
// The runnable is likely to interrupt during the session#commit, since
// this takes the longest
- final Object starter = new Object();
+ final CountDownLatch starter = new CountDownLatch(1);
final AtomicBoolean restarted = new AtomicBoolean();
new Thread(new Runnable() {
public void run() {
try {
- synchronized (starter) {
- starter.wait();
- }
+ starter.await();
// Simulate broker failure & restart
bs.stop();
@@ -97,9 +96,6 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
}
}).start();
- synchronized (starter) {
- starter.notifyAll();
- }
for (int i = 0; i < MESSAGE_COUNT; i++) {
Message message = consumer.receive(500);
assertNotNull("No Message " + i + " found", message);
@@ -108,9 +104,7 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
assertFalse("Timing problem, restarted too soon", restarted
.get());
if (i == 10) {
- synchronized (starter) {
- starter.notifyAll();
- }
+ starter.countDown();
}
if (i > MESSAGE_COUNT - 100) {
assertTrue("Timing problem, restarted too late", restarted
@@ -143,14 +137,12 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
// The runnable is likely to interrupt during the session#commit, since
// this takes the longest
- final Object starter = new Object();
+ final CountDownLatch starter = new CountDownLatch(1);
final AtomicBoolean restarted = new AtomicBoolean();
new Thread(new Runnable() {
public void run() {
try {
- synchronized (starter) {
- starter.wait();
- }
+ starter.await();
// Simulate broker failure & restart
bs.stop();
@@ -167,9 +159,6 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
}
}).start();
- synchronized (starter) {
- starter.notifyAll();
- }
Collection<Integer> results = new ArrayList<Integer>(MESSAGE_COUNT);
for (int i = 0; i < MESSAGE_COUNT; i++) {
Message message1 = consumer1.receive(20);
@@ -191,9 +180,7 @@ public class AMQ1925Test extends TestCase implements ExceptionListener {
assertFalse("Timing problem, restarted too soon", restarted
.get());
if (i == 10) {
- synchronized (starter) {
- starter.notifyAll();
- }
+ starter.countDown();
}
if (i > MESSAGE_COUNT - 50) {
assertTrue("Timing problem, restarted too late", restarted
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
index 1d770de..7defe95 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
@@ -46,7 +46,7 @@ public abstract class UdpTestSupport extends TestCase implements TransportListen
protected Transport producer;
protected Transport consumer;
- protected Object lock = new Object();
+ protected final Object lock = new Object();
protected Command receivedCommand;
protected TransportServer server;
protected boolean large;
@@ -251,10 +251,10 @@ public abstract class UdpTestSupport extends TestCase implements TransportListen
Command answer = null;
synchronized (lock) {
answer = receivedCommand;
- if (answer == null) {
+ while (answer == null) {
lock.wait(waitForCommandTimeout);
+ answer = receivedCommand;
}
- answer = receivedCommand;
}
assertNotNull("Should have received a Command by now!", answer);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
index e1035a6..0e71dfe 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
@@ -107,7 +107,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
// periodically start a durable sub that has a backlog
final int consumersToActivate = 5;
- final Object addConsumerSignal = new Object();
+ final CountDownLatch addConsumerSignal = new CountDownLatch(1);
Executors.newCachedThreadPool(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
@@ -120,9 +120,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
MessageConsumer consumer = null;
for (int i = 0; i < consumersToActivate; i++) {
LOG.info("Waiting for add signal from producer...");
- synchronized (addConsumerSignal) {
- addConsumerSignal.wait(30 * 60 * 1000);
- }
+ addConsumerSignal.await(30, TimeUnit.MINUTES);
TimedMessageListener listener = new TimedMessageListener();
consumer = createDurableSubscriber(factory.createConnection(), destination, "consumer" + (i + 1));
LOG.info("Created consumer " + consumer);
@@ -254,7 +252,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
final int numIterations,
Session session,
MessageProducer producer,
- Object addConsumerSignal) throws Exception {
+ CountDownLatch addConsumerSignal) throws Exception {
long start;
long count = 0;
double batchMax = 0, max = 0, sum = 0;
@@ -269,10 +267,8 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
max = Math.max(max, (System.currentTimeMillis() - singleSendstart));
if (++count % 500 == 0) {
if (addConsumerSignal != null) {
- synchronized (addConsumerSignal) {
- addConsumerSignal.notifyAll();
- LOG.info("Signalled add consumer");
- }
+ addConsumerSignal.countDown();
+ LOG.info("Signalled add consumer");
}
};
if (count % 5000 == 0) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
index 34807c6..931fb55 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
@@ -95,7 +95,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
// periodically start a queue consumer
final int consumersToActivate = 5;
- final Object addConsumerSignal = new Object();
+ final CountDownLatch addConsumerSignal = new CountDownLatch(1);
Executors.newCachedThreadPool(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
@@ -108,9 +108,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
MessageConsumer consumer = null;
for (int i = 0; i < consumersToActivate; i++) {
LOG.info("Waiting for add signal from producer...");
- synchronized (addConsumerSignal) {
- addConsumerSignal.wait(30 * 60 * 1000);
- }
+ addConsumerSignal.await(30, TimeUnit.MINUTES);
TimedMessageListener listener = new TimedMessageListener();
consumer = createConsumer(factory.createConnection(), destination);
LOG.info("Created consumer " + consumer);
@@ -241,7 +239,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
final int numIterations,
Session session,
MessageProducer producer,
- Object addConsumerSignal) throws Exception {
+ CountDownLatch addConsumerSignal) throws Exception {
long start;
long count = 0;
double batchMax = 0, max = 0, sum = 0;
@@ -257,10 +255,8 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
max = Math.max(max, (System.currentTimeMillis() - singleSendstart));
if (++count % 500 == 0) {
if (addConsumerSignal != null) {
- synchronized (addConsumerSignal) {
- addConsumerSignal.notifyAll();
- LOG.info("Signalled add consumer");
- }
+ addConsumerSignal.countDown();
+ LOG.info("Signalled add consumer");
}
}
;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
index bd5c4c8..df02d9e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
@@ -44,7 +44,7 @@ public class MultiBrokersMultiClientsTest extends JmsMultipleBrokersTestSupport
private static final Logger LOG = LoggerFactory.getLogger(MultiBrokersMultiClientsTest.class);
protected Map<String, MessageConsumer> consumerMap;
- Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>();
+ final Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>();
public void testTopicAllConnected() throws Exception {
bridgeAllBrokers();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
index 2aa614d..6d28f34 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
@@ -265,7 +265,7 @@ public class NoDuplicateOnTopicNetworkTest extends CombinationTestSupport {
private MessageConsumer consumer;
private final String durableID = "DURABLE_ID";
- private List<String> receivedStrings = Collections.synchronizedList(new ArrayList<String>());
+ private final List<String> receivedStrings = Collections.synchronizedList(new ArrayList<String>());
private int numMessages = 10;
private CountDownLatch recievedLatch = new CountDownLatch(numMessages);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
index 05fd5f8..9dc0032 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
@@ -47,8 +47,8 @@ public class ReliableReconnectTest extends org.apache.activemq.TestSupport {
protected int deliveryMode = DeliveryMode.PERSISTENT;
protected String consumerClientId;
protected Destination destination;
- protected AtomicBoolean closeBroker = new AtomicBoolean(false);
- protected AtomicInteger messagesReceived = new AtomicInteger(0);
+ protected final AtomicBoolean closeBroker = new AtomicBoolean(false);
+ protected final AtomicInteger messagesReceived = new AtomicInteger(0);
protected BrokerService broker;
protected int firstBatch = MESSAGE_COUNT / 10;
private IdGenerator idGen = new IdGenerator();
@@ -159,7 +159,7 @@ public class ReliableReconnectTest extends org.apache.activemq.TestSupport {
connection.close();
spawnConsumer();
synchronized (closeBroker) {
- if (!closeBroker.get()) {
+ while (!closeBroker.get()) {
closeBroker.wait();
}
}
@@ -168,7 +168,7 @@ public class ReliableReconnectTest extends org.apache.activemq.TestSupport {
startBroker(false);
// System.err.println("Started Broker again");
synchronized (messagesReceived) {
- if (messagesReceived.get() < MESSAGE_COUNT) {
+ while (messagesReceived.get() < MESSAGE_COUNT) {
messagesReceived.wait(60000);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
index 9eeb28c..eb5a3e2 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
@@ -51,7 +51,7 @@ public class VerifyNetworkConsumersDisconnectTest extends JmsMultipleBrokersTest
public static final int TIMEOUT = 30000;
protected Map<String, MessageConsumer> consumerMap;
- Map<Thread, Throwable> unhandledExceptions = new HashMap<Thread, Throwable>();
+ final Map<Thread, Throwable> unhandledExceptions = new HashMap<Thread, Throwable>();
private void assertNoUnhandledExceptions() {
for( Entry<Thread, Throwable> e: unhandledExceptions.entrySet()) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ae6a2b87/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java
index 7140a86..c644c67 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/MessageIdList.java
@@ -140,20 +140,28 @@ public class MessageIdList extends Assert implements MessageListener {
long start = System.currentTimeMillis();
- for (int i = 0; i < messageCount; i++) {
- try {
- if (hasReceivedMessages(messageCount)) {
- break;
- }
- long duration = System.currentTimeMillis() - start;
- if (duration >= maximumDuration) {
- break;
- }
- synchronized (semaphore) {
+ synchronized (semaphore)
+ {
+ for (int i = 0; i < messageCount; i++)
+ {
+ try
+ {
+ if (hasReceivedMessages(messageCount))
+ {
+ break;
+ }
+ long duration = System.currentTimeMillis() - start;
+ if (duration >= maximumDuration)
+ {
+ break;
+ }
+
semaphore.wait(maximumDuration - duration);
}
- } catch (InterruptedException e) {
- LOG.info("Caught: " + e);
+ catch (InterruptedException e)
+ {
+ LOG.info("Caught: " + e);
+ }
}
}
long end = System.currentTimeMillis() - start;