Fix for NACKed messages in cluster

Author: pzygielo

mq/main/mq-broker/broker-core/lombok.config

@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2025 Contributors to Eclipse Foundation. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+

mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Destination.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2025 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -3000,7 +3000,7 @@ private RemoveMessageReturnInfo _removeMessage(SysMessageID id, Reason r, Hashta
                 if (remoteRef == null) {
                     ref = destMessages.remove(id, r);
                 } else {
-                    PacketReference errValue = PacketReference.createReference(null, null, null);
+                    PacketReference errValue = PacketReference.getInvalidReference();
                     PacketReference o = destMessages.removeWithValue(id, remoteRef, errValue, r);
                     if (o == errValue) { /* intended */
                         logger.log(((DEBUG_CLUSTER || getDEBUG()) ? Logger.INFO : Logger.DEBUG),

mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/PacketReference.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2020 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2025 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,6 +40,10 @@
 import com.sun.messaging.jmq.util.lists.*;
 import com.sun.messaging.jmq.util.UID;
 import com.sun.messaging.jmq.util.log.Logger;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 import com.sun.messaging.jmq.jmsserver.cluster.api.ClusterBroadcast;
 import com.sun.messaging.jmq.jmsserver.memory.MemoryGlobals;
 import com.sun.messaging.jmq.jmsserver.FaultInjection;
@@ -51,6 +55,7 @@
  *
  */
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class PacketReference implements Sized, Ordered {
 
     private static FaultInjection FI = FaultInjection.getInjection();
@@ -64,6 +69,8 @@ public class PacketReference implements Sized, Ordered {
 
     private boolean commit2pwait = Globals.getConfig().getBooleanProperty(Globals.IMQ + ".cluster.2pcommitAckWaitReply", false);
 
+    private static final PacketReference INVALID_PACKET_REFERENCE = new PacketReference();
+
     static {
         queueUID = new ConsumerUID(true /* empty */);
         queueUID.setShouldStore(true);
@@ -382,6 +389,10 @@ public static ConsumerUID getQueueUID() {
         return queueUID;
     }
 
+    public static PacketReference getInvalidReference() {
+        return INVALID_PACKET_REFERENCE;
+    }
+
     public static PacketReference createReferenceWithDestination(PartitionedStore ps, Packet p, Destination dest, Connection con) throws BrokerException {
         PacketReference ref = createReference(ps, p, dest.getDestinationUID(), con);
         if (dest.isDMQ()) {

mq/main/mq-broker/broker-core/src/test/java/com/sun/messaging/jmq/jmsserver/core/PacketReference_getInvalidReference_Test.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.messaging.jmq.jmsserver.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class PacketReference_getInvalidReference_Test {
+    @Test
+    void invalidReferenceShouldNotBeNull() {
+        assertThat(PacketReference.getInvalidReference()).isNotNull();
+    }
+}