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 2022/05/23 18:42:19 UTC

[activemq-artemis] 07/07: fixing test

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch new-paging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 16757d89b06f0263fae5a4f91959aab9188b9b1d
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon May 23 09:46:19 2022 -0400

    fixing test
---
 .../java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java    | 1 +
 .../main/java/org/apache/activemq/artemis/core/paging/impl/Page.java    | 1 +
 .../org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java  | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
index 10dce85267..bd434ebc54 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java
@@ -78,6 +78,7 @@ public class ReferenceCounterUtil implements ReferenceCounter, AutoCloseable {
 
    public void reset() {
       execute();
+      useUpdater.set(this, 0);
    }
 
    private void execute() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
index ffdace530e..1f20331a1d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
@@ -497,6 +497,7 @@ public final class Page implements Comparable<Page> {
                PagedMessage msg = iter.next();
                if ((msg.getMessage()).isLargeMessage()) {
                   ((LargeServerMessage)(msg.getMessage())).deleteFile();
+                  msg.getMessage().usageDown();
                }
             }
          }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java
index ab12b43124..1eb946c17d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java
@@ -91,8 +91,6 @@ public class PagedMessageImpl implements PagedMessage {
 
    private final int storedSize;
 
-   private int fileOffset;
-
    private final StorageManager storageManager;
 
    private long pageNr;