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

This closes #236

This commit is contained in:
Clebert Suconic 2015-05-21 19:45:02 -04:00
parent 27cbc92a92 7ca05753bf
commit 30416db00e
10 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
View File

@ -1878,6 +1878,7 @@ public final class JMSBridgeImpl implements JMSBridge
}
@Override
@SuppressWarnings("WaitNotInLoop") // both lock.wait(..) either returns, throws or continue, thus avoiding spurious wakes
public void run()
{
while (started)

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSQueueConfiguration.java
View File

@ -32,5 +32,5 @@ public interface JMSQueueConfiguration
String[] getBindings();
JMSQueueConfiguration setBindings(String[] bindings);
JMSQueueConfiguration setBindings(String... bindings);
}

4
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java
View File

@ -266,7 +266,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
{
if (ActiveMQRAStreamMessage.trace)
{
ActiveMQRALogger.LOGGER.trace("writeBytes(" + value + ", " + offset + ", " + length + ")");
ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ", " + offset + ", " + length + ")");
}
((StreamMessage)message).writeBytes(value, offset, length);
@ -281,7 +281,7 @@ public class ActiveMQRAStreamMessage extends ActiveMQRAMessage implements Stream
{
if (ActiveMQRAStreamMessage.trace)
{
ActiveMQRALogger.LOGGER.trace("writeBytes(" + value + ")");
ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ")");
}
((StreamMessage)message).writeBytes(value);

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -2465,6 +2465,7 @@ public class QueueImpl implements Queue
acknowledge(tx, ref);
}
@SuppressWarnings({"ArrayToString", "ArrayToStringConcatentation"})
private void moveBetweenSnFQueues(final SimpleString queueSuffix,
final Transaction tx,
final MessageReference ref) throws Exception
@ -2481,7 +2482,8 @@ public class QueueImpl implements Queue
if (propName.startsWith(MessageImpl.HDR_ROUTE_TO_IDS))
{
oldRouteToIDs = (byte[]) copyMessage.removeProperty(propName);
ActiveMQServerLogger.LOGGER.debug("Removed property from message: " + propName + " = " + oldRouteToIDs + " (" + ByteBuffer.wrap(oldRouteToIDs).getLong() + ")");
final String hashcodeToString = oldRouteToIDs.toString(); // don't use Arrays.toString(..) here
ActiveMQServerLogger.LOGGER.debug("Removed property from message: " + propName + " = " + hashcodeToString + " (" + ByteBuffer.wrap(oldRouteToIDs).getLong() + ")");
// there should only be one of these properties so potentially save some loop iterations
break;

16
pom.xml
View File

@ -700,6 +700,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<!-- Enable Google's Error-Prone https://github.com/google/error-prone -->
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs>
<!-- DepAnn fail for generated sources. Changing to WARN instead -->
<arg>-Xep:DepAnn:WARN</arg>
</compilerArgs>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

3
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
View File

@ -235,8 +235,9 @@ public class LargeMessageTest extends LargeMessageTestBase
msg1.getBodyBuffer().readByte();
Assert.fail("Exception was expected");
}
catch (Throwable ignored)
catch (final Exception ignored)
{
// empty on purpose
}
session.close();

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
View File

@ -276,7 +276,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
{
ActiveMQServer server = servers[bNode];
log.debug("waiting for " + nodes + " on the topology for server = " + server);
log.debug("waiting for " + Arrays.toString(nodes) + " on the topology for server = " + server);
long start = System.currentTimeMillis();
@ -322,7 +322,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
while (System.currentTimeMillis() - start < WAIT_TIMEOUT);
if (!exists)
{
String msg = "Timed out waiting for cluster topology of " + nodes +
String msg = "Timed out waiting for cluster topology of " + Arrays.toString(nodes) +
" (received " +
topology.getMembers().size() +
") topology = " +

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
View File

@ -391,7 +391,7 @@ public class DiscoveryTest extends DiscoveryBaseTest
byte[] btreceived = client.receiveBroadcast(5, TimeUnit.SECONDS);
System.out.println("BTReceived = " + btreceived);
System.out.println("BTReceived = " + Arrays.toString(btreceived));
assertNotNull(btreceived);

5
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
View File

@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.tests.integration.management;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@ -193,12 +194,12 @@ public class ManagementHelperTest extends Assert
String key1 = RandomUtil.randomString();
String[] val1 = new String[]{"a", "b", "c"};
ManagementHelperTest.log.info("val1 type is " + val1);
ManagementHelperTest.log.info("val1 type is " + Arrays.toString(val1));
String key2 = RandomUtil.randomString();
Integer[] val2 = new Integer[]{1, 2, 3, 4, 5};
ManagementHelperTest.log.info("val2 type is " + val2);
ManagementHelperTest.log.info("val2 type is " + Arrays.toString(val2));
map.put(key1, val1);
map.put(key2, val2);

1
tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQAdmin.java
View File

@ -252,7 +252,6 @@ public class ActiveMQAdmin implements Admin
while ((line = br.readLine()) != null)
{
System.out.println("SERVER: " + line);
line.replace('|', '\n');
if ("OK".equals(line.trim()))
{
new Thread()