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

ARTEMIS-357 No need to check copy any longer

This commit is contained in:
Clebert Suconic 2016-01-23 10:45:35 -05:00
parent 4a33d2d489
commit 7957f574f6
4 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
View File

@ -84,8 +84,6 @@ public abstract class MessageImpl implements MessageInternal {
private int endOfMessagePosition; private int endOfMessagePosition;
private boolean copied = true;
private UUID userID; private UUID userID;
// Constructors -------------------------------------------------- // Constructors --------------------------------------------------
@ -152,7 +150,6 @@ public abstract class MessageImpl implements MessageInternal {
bufferValid = other.bufferValid; bufferValid = other.bufferValid;
endOfBodyPosition = other.endOfBodyPosition; endOfBodyPosition = other.endOfBodyPosition;
endOfMessagePosition = other.endOfMessagePosition; endOfMessagePosition = other.endOfMessagePosition;
copied = other.copied;
if (other.buffer != null) { if (other.buffer != null) {
// We need to copy the underlying buffer too, since the different messsages thereafter might have different // We need to copy the underlying buffer too, since the different messsages thereafter might have different
@ -438,29 +435,11 @@ public abstract class MessageImpl implements MessageInternal {
@Override @Override
public void bodyChanged() { public void bodyChanged() {
// If the body is changed we must copy the buffer otherwise can affect the previously sent message
// which might be in the Netty write queue
checkCopy();
bufferValid = false; bufferValid = false;
endOfBodyPosition = -1; endOfBodyPosition = -1;
} }
@Override
public synchronized void checkCopy() {
if (!copied) {
forceCopy();
copied = true;
}
}
@Override
public synchronized void resetCopied() {
copied = false;
}
@Override @Override
public int getEndOfMessagePosition() { public int getEndOfMessagePosition() {
return endOfMessagePosition; return endOfMessagePosition;

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternal.java
View File

@ -33,12 +33,8 @@ public interface MessageInternal extends Message {
int getEndOfBodyPosition(); int getEndOfBodyPosition();
void checkCopy();
void bodyChanged(); void bodyChanged();
void resetCopied();
boolean isServerMessage(); boolean isServerMessage();
ActiveMQBuffer getEncodedBuffer(); ActiveMQBuffer getEncodedBuffer();

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java
View File

@ -93,8 +93,6 @@ public class SessionSendMessage extends MessagePacket {
// Position reader for reading by Netty // Position reader for reading by Netty
bufferWrite.readerIndex(0); bufferWrite.readerIndex(0);
message.resetCopied();
return bufferWrite; return bufferWrite;
} }

10
artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
View File

@ -429,21 +429,11 @@ public class ScheduledDeliveryHandlerTest extends Assert {
return 0; return 0;
} }
@Override
public void checkCopy() {
}
@Override @Override
public void bodyChanged() { public void bodyChanged() {
} }
@Override
public void resetCopied() {
}
@Override @Override
public boolean isServerMessage() { public boolean isServerMessage() {
return false; return false;