This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 8ecd6ff37eb9 CAMEL-25337: Fix wrong comparison in MLLP consumer
sendAcknowledgement
8ecd6ff37eb9 is described below
commit 8ecd6ff37eb9646dfedda5c2f2caa49bf1e0a628
Author: Torsten Mielke <[email protected]>
AuthorDate: Mon Oct 5 11:34:32 2026 +0200
CAMEL-25337: Fix wrong comparison in MLLP consumer sendAcknowledgement
The segment delimiter scan in sendAcknowledgement compared
SEGMENT_DELIMITER (0x0D) against the loop index instead of the
byte value at that index, so the MSA segment was only found when
it happened to start at byte offset 13. Compare against
originalHl7MessageBytes[i] instead.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
---
.../component/mllp/MllpTcpServerConsumer.java | 2 +-
...lpTcpServerConsumerSendAcknowledgementTest.java | 117 +++++++++++++++++++++
2 files changed, 118 insertions(+), 1 deletion(-)
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index edb576b07795..bc3f0afc44b4 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -577,7 +577,7 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
final byte fieldSeparator = originalHl7MessageBytes[3];
// Acknowledgment is specified in exchange property - determine
the acknowledgement type
for (int i = 0; i < originalHl7MessageBytes.length; ++i) {
- if (MllpProtocolConstants.SEGMENT_DELIMITER == i) {
+ if (MllpProtocolConstants.SEGMENT_DELIMITER ==
originalHl7MessageBytes[i]) {
if (i + 7 < originalHl7MessageBytes.length // Make sure we
don't run off the end of the message
&& bM == originalHl7MessageBytes[i + 1] && bS ==
originalHl7MessageBytes[i + 2]
&& bA == originalHl7MessageBytes[i + 3] &&
fieldSeparator == originalHl7MessageBytes[i + 4]) {
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerSendAcknowledgementTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerSendAcknowledgementTest.java
new file mode 100644
index 000000000000..9cd28f10b0c9
--- /dev/null
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerSendAcknowledgementTest.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mllp;
+
+import java.net.Socket;
+import java.nio.charset.Charset;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mllp.internal.MllpSocketBuffer;
+import org.apache.camel.component.mllp.internal.TcpSocketConsumerRunnable;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.support.DefaultExchange;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MllpTcpServerConsumerSendAcknowledgementTest {
+
+ private CamelContext context;
+ private MllpTcpServerConsumer consumer;
+ private MllpEndpoint endpoint;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ context = new DefaultCamelContext();
+ context.start();
+ MllpComponent mllpComponent = context.getComponent("mllp",
MllpComponent.class);
+ endpoint = (MllpEndpoint)
mllpComponent.createEndpoint("mllp://localhost:0");
+ consumer = new MllpTcpServerConsumer(endpoint, exchange -> {
+ });
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ if (consumer != null) {
+ consumer.stop();
+ }
+ if (endpoint != null) {
+ endpoint.stop();
+ }
+ if (context != null) {
+ context.stop();
+ }
+ }
+
+ @Test
+ void testAcknowledgementTypeExtractedFromMsaSegment() {
+ // HL7 message where the \r segment delimiter is at position 62, well
past position 13.
+ // MSA|AA|00001 follows after the \r.
+ // With the bug (SEGMENT_DELIMITER == i), only position 13 is checked
for \r,
+ // so MSA is never found and MLLP_ACKNOWLEDGEMENT_TYPE stays null.
+ byte[] originalMessage
+ =
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20160902123950||ACK^A08|00001|D|2.3\rMSA|AA|00001\r".getBytes();
+ byte[] acknowledgementBytes =
"MSH|^~\\&|ACK\rMSA|AA|00001\r".getBytes();
+
+ Exchange exchange = new DefaultExchange(context);
+ exchange.setProperty(MllpConstants.MLLP_ACKNOWLEDGEMENT,
acknowledgementBytes);
+
+ TcpSocketConsumerRunnable mockRunnable =
createMockRunnable(acknowledgementBytes);
+
+ consumer.sendAcknowledgement(originalMessage, exchange, mockRunnable);
+
+ assertEquals("AA",
exchange.getMessage().getHeader(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE),
+ "MLLP_ACKNOWLEDGEMENT_TYPE should be extracted from the MSA
segment");
+ }
+
+ @Test
+ void testAcknowledgementTypeExtractedWhenDelimiterAtPosition13() {
+ // MSH segment is exactly 13 bytes so the \r falls at byte offset 13
(== 0x0D).
+ // This is the edge case where the original bug accidentally matched
because
+ // the loop index equalled the SEGMENT_DELIMITER constant.
+ byte[] originalMessage = "MSH|^~\\&|A|B|\rMSA|AE|00002\r".getBytes();
+ byte[] acknowledgementBytes =
"MSH|^~\\&|ACK\rMSA|AE|00002\r".getBytes();
+
+ Exchange exchange = new DefaultExchange(context);
+ exchange.setProperty(MllpConstants.MLLP_ACKNOWLEDGEMENT,
acknowledgementBytes);
+
+ TcpSocketConsumerRunnable mockRunnable =
createMockRunnable(acknowledgementBytes);
+
+ consumer.sendAcknowledgement(originalMessage, exchange, mockRunnable);
+
+ assertEquals("AE",
exchange.getMessage().getHeader(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE),
+ "MLLP_ACKNOWLEDGEMENT_TYPE should be extracted when segment
delimiter is at position 13");
+ }
+
+ private TcpSocketConsumerRunnable createMockRunnable(byte[]
acknowledgementBytes) {
+ TcpSocketConsumerRunnable mockRunnable =
mock(TcpSocketConsumerRunnable.class);
+ Socket mockSocket = mock(Socket.class);
+ MllpSocketBuffer mockBuffer = mock(MllpSocketBuffer.class);
+ when(mockRunnable.getSocket()).thenReturn(mockSocket);
+ when(mockRunnable.getMllpBuffer()).thenReturn(mockBuffer);
+ when(mockBuffer.hasCompleteEnvelope()).thenReturn(true);
+ when(mockBuffer.toMllpPayload()).thenReturn(acknowledgementBytes);
+ when(mockBuffer.toHl7String(any(Charset.class))).thenReturn("");
+ return mockRunnable;
+ }
+}
