From 452330153e6243cfb055577d71324cee38a2821e Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Thu, 9 Feb 2017 16:13:55 -0500 Subject: [PATCH] NO-JIRA: MessageImpl::forceCopy is no longer used --- .../core/buffers/impl/ChannelBufferWrapper.java | 2 +- .../impl/ResetLimitWrappedActiveMQBuffer.java | 7 ------- .../artemis/core/message/impl/MessageImpl.java | 12 ------------ 3 files changed, 1 insertion(+), 20 deletions(-) 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 c75be21c63..690dbd7795 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 @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.utils.UTF8Util; public class ChannelBufferWrapper implements ActiveMQBuffer { - protected ByteBuf buffer; // NO_UCD (use final) + protected final ByteBuf buffer; private final boolean releasable; private final boolean isPooled; public static ByteBuf unwrap(ByteBuf buffer) { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java index ec6cf092e1..900305f59a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java @@ -71,13 +71,6 @@ public final class ResetLimitWrappedActiveMQBuffer extends ChannelBufferWrapper } } - public void setBuffer(final ActiveMQBuffer buffer) { - if (this.buffer != null) { - this.buffer.release(); - } - this.buffer = buffer.byteBuf(); - } - @Override public void clear() { changed(); diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java index 69e6e6520b..f93086c5bf 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java @@ -1020,18 +1020,6 @@ public abstract class MessageImpl implements MessageInternal { buffer.setIndex(BODY_OFFSET, BODY_OFFSET); } - private void forceCopy() { - // Must copy buffer before sending it - - buffer = buffer.copy(0, buffer.capacity()); - - buffer.setIndex(0, getEndOfBodyPosition()); - - if (bodyBuffer != null) { - bodyBuffer.setBuffer(buffer); - } - } - // Inner classes ------------------------------------------------- private final class DecodingContext implements BodyEncoder {