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 2019/09/23 14:40:19 UTC
[activemq-artemis] branch master updated: NO-JIRA renaming method
to reflect its real operation
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 8b9819b NO-JIRA renaming method to reflect its real operation
new 77376e5 This closes #2849
8b9819b is described below
commit 8b9819b2b6fd9698a3213ff0c092e42a416da023
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Sep 23 09:51:35 2019 -0400
NO-JIRA renaming method to reflect its real operation
---
.../org/apache/activemq/artemis/api/core/ICoreMessage.java | 10 ++++++++--
.../apache/activemq/artemis/core/message/impl/CoreMessage.java | 2 +-
.../core/persistence/impl/journal/JournalStorageManager.java | 2 +-
.../core/persistence/impl/nullpm/NullStorageManager.java | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
index 66c4cdf..b76764e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
@@ -83,9 +83,15 @@ public interface ICoreMessage extends Message {
int getEndOfBodyPosition();
/**
- * Used on large messages treatment
+ * Used on large messages treatment.
+ * this method is used to transfer properties from a temporary CoreMessage to a definitive one.
+ * This is used when before a Message was defined as a LargeMessages, its properties are then moved from the
+ * Temporary message to its final LargeMessage object.
+ *
+ * Be careful as this will not perform a copy of the Properties.
+ * For real copy, use the copy methods or copy constructors.
*/
- void copyHeadersAndProperties(Message msg);
+ void moveHeadersAndProperties(Message msg);
void sendBuffer_1X(ByteBuf sendBuffer);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 3596720..1a2353c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -450,7 +450,7 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
}
@Override
- public void copyHeadersAndProperties(final Message msg) {
+ public void moveHeadersAndProperties(final Message msg) {
messageID = msg.getMessageID();
address = msg.getAddressSimpleString();
userID = (UUID) msg.getUserID();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 2ae475c..e5da1d9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -549,7 +549,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
LargeServerMessageImpl largeMessage = (LargeServerMessageImpl) createLargeMessage();
- largeMessage.copyHeadersAndProperties(message);
+ largeMessage.moveHeadersAndProperties(message);
largeMessage.setMessageID(id);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
index ef9ff94..fd765e1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
@@ -291,7 +291,7 @@ public class NullStorageManager implements StorageManager {
public LargeServerMessage createLargeMessage(final long id, final Message message) {
NullStorageLargeServerMessage largeMessage = new NullStorageLargeServerMessage();
- largeMessage.copyHeadersAndProperties(message);
+ largeMessage.moveHeadersAndProperties(message);
largeMessage.setMessageID(id);