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 2016/06/13 18:21:23 UTC
[2/7] activemq-artemis git commit: Fix checkstyle curly brace
violations
Fix checkstyle curly brace violations
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e4937480
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e4937480
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e4937480
Branch: refs/heads/master
Commit: e4937480405d46a28ae36b4167c1680dd4a62386
Parents: fb56cc7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Mon Jun 13 18:21:43 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Mon Jun 13 18:21:43 2016 +0300
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/tools/XmlDataImporter.java | 3 +--
.../artemis/core/buffers/impl/ChannelBufferWrapper.java | 4 ++--
.../main/java/org/apache/activemq/artemis/utils/Base64.java | 3 +--
.../activemq/artemis/core/client/impl/ClientSessionImpl.java | 6 ++----
.../artemis/core/client/impl/LargeMessageControllerImpl.java | 3 +--
.../artemis/tests/unit/core/remoting/AcceptorsTest.java | 3 +--
6 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
index e75aef8..694525d 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
@@ -454,8 +454,7 @@ public final class XmlDataImporter extends ActionAbstract {
else {
String characters = new String(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
String trimmedCharacters = characters.trim();
- if (trimmedCharacters.length() > 0) // this will skip "indentation" characters
- {
+ if (trimmedCharacters.length() > 0) { // this will skip "indentation" characters
byte[] data = decode(trimmedCharacters);
out.write(data);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
index 5c0cbdd..aea9867 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java
@@ -34,8 +34,8 @@ public class ChannelBufferWrapper implements ActiveMQBuffer {
public static ByteBuf unwrap(ByteBuf buffer) {
ByteBuf parent;
- while ((parent = buffer.unwrap()) != null && parent != buffer) // this last part is just in case the semantic
- { // ever changes where unwrap is returning itself
+ while ((parent = buffer.unwrap()) != null && parent != buffer) { // this last part is just in case the semantic
+ // ever changes where unwrap is returning itself
buffer = parent;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
index 5284246..8379fdf 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
@@ -847,8 +847,7 @@ public class Base64 {
sbiCrop = (byte) (source[i] & 0x7f); // Only the low seven bits
sbiDecode = DECODABET[sbiCrop];
- if (sbiDecode >= Base64.WHITE_SPACE_ENC) // White space, Equals sign or better
- {
+ if (sbiDecode >= Base64.WHITE_SPACE_ENC) { // White space, Equals sign or better
if (sbiDecode >= Base64.EQUALS_SIGN_ENC) {
b4[b4Posn++] = sbiCrop;
if (b4Posn > 3) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index c329bbd..bec10fb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -543,13 +543,11 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
}
@Override
- public void rollback(final boolean isLastMessageAsDelivered) throws ActiveMQException
- {
+ public void rollback(final boolean isLastMessageAsDelivered) throws ActiveMQException {
rollback(isLastMessageAsDelivered, true);
}
- public void rollback(final boolean isLastMessageAsDelivered, final boolean waitConsumers) throws ActiveMQException
- {
+ public void rollback(final boolean isLastMessageAsDelivered, final boolean waitConsumers) throws ActiveMQException {
if (logger.isTraceEnabled()) {
logger.trace("calling rollback(isLastMessageAsDelivered=" + isLastMessageAsDelivered + ")");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index 77134ee..c3b18a3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -1094,8 +1094,7 @@ public class LargeMessageControllerImpl implements LargeMessageController {
throw new IndexOutOfBoundsException();
}
- if (currentPacket.chunk == null) // Empty packet as a signal to interruption
- {
+ if (currentPacket.chunk == null) { // Empty packet as a signal to interruption
currentPacket = null;
streamEnded = true;
throw new IndexOutOfBoundsException();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4937480/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java
index f6aae80..6889393 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java
@@ -31,8 +31,7 @@ import org.junit.Test;
public class AcceptorsTest extends ActiveMQTestBase {
@Test
- public void testMultipleAcceptorsWithSameHostPortDifferentName() throws Exception
- {
+ public void testMultipleAcceptorsWithSameHostPortDifferentName() throws Exception {
final String acceptorFactoryClass = FakeAcceptorFactory.class.getName();
Map<String, Object> params = new HashMap<>();