From 71685bf6bffaadcf8abc6281a698c243378947fb Mon Sep 17 00:00:00 2001
From: franz1981 <nigro.fra@gmail.com>
Date: Tue, 5 Jan 2021 15:03:47 +0100
Subject: [PATCH 1/2] ARTEMIS-3051 Fix MessageReferenceImpl::getMemoryEstimate

---
 .../activemq/artemis/core/server/impl/MessageReferenceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index 09b3650ffd..a45e84ac69 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -86,7 +86,7 @@ public class MessageReferenceImpl extends LinkedListImpl.Node<MessageReferenceIm
 
    // Static --------------------------------------------------------
 
-   private static final int memoryOffset = 64;
+   private static final int memoryOffset = 72;
 
    // Constructors --------------------------------------------------
 

From 9e06a0645bf11ff1bbcc4c7230db1e1138f02c73 Mon Sep 17 00:00:00 2001
From: franz1981 <nigro.fra@gmail.com>
Date: Mon, 11 Jan 2021 07:45:22 +0100
Subject: [PATCH 2/2] ARTEMIS-3051 Fix MessageReferenceImpl::getMemoryEstimate

---
 .../activemq/artemis/core/server/impl/MessageReferenceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index a45e84ac69..a7903fdaa9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -86,6 +86,8 @@ public class MessageReferenceImpl extends LinkedListImpl.Node<MessageReferenceIm
 
    // Static --------------------------------------------------------
 
+   // This value has been computed by using https://github.com/openjdk/jol
+   // on HotSpot 64-bit VM COOPS, 8-byte alignment
    private static final int memoryOffset = 72;
 
    // Constructors --------------------------------------------------