You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/11/22 19:57:08 UTC
[2/2] camel git commit: CAMEL-10510: Change
HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property
instead of message header
CAMEL-10510: Change HL7AcknowledgementGenerator to set CamelMllpAcknowledgement exchange property instead of message header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/466bcab1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/466bcab1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/466bcab1
Branch: refs/heads/camel-2.18.x
Commit: 466bcab19b3faa722f075a6f286e64419ca3fc5f
Parents: d1a9f9f
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Tue Nov 22 12:04:04 2016 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 22 20:56:25 2016 +0100
----------------------------------------------------------------------
.../apache/camel/component/mllp/MllpTcpServerConsumer.java | 1 -
.../mllp/impl/AcknowledgmentSynchronizationAdapter.java | 2 +-
.../camel/processor/mllp/Hl7AcknowledgementGenerator.java | 8 ++++----
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
----------------------------------------------------------------------
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 1648b8a..05b8cbe 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
@@ -324,7 +324,6 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
*/
class ClientSocketThread extends Thread {
Socket clientSocket;
- Hl7AcknowledgementGenerator acknowledgementGenerator = new Hl7AcknowledgementGenerator();
Integer initialByte;
http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
index 6d4b76c..c7916d4 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/AcknowledgmentSynchronizationAdapter.java
@@ -72,7 +72,7 @@ public class AcknowledgmentSynchronizationAdapter extends SynchronizationAdapter
}
// Find the acknowledgement body
- // TODO: Enhance this to say whether or not the acknowlment is missing or just of an uncovertable type
+ // TODO: Enhance this to say whether or not the acknowledgment is missing or just of an unconvertible type
byte[] acknowledgementMessageBytes = exchange.getProperty(MLLP_ACKNOWLEDGEMENT, byte[].class);
String acknowledgementMessageType = null;
if (null == acknowledgementMessageBytes) {
http://git-wip-us.apache.org/repos/asf/camel/blob/466bcab1/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
index 265db76..c7f4473 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
@@ -56,13 +56,13 @@ public class Hl7AcknowledgementGenerator implements Processor {
byte[] acknowledgementBytes = null;
if (null == exchange.getException()) {
acknowledgementBytes = generateApplicationAcceptAcknowledgementMessage(hl7Bytes);
- message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
+ exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
} else {
acknowledgementBytes = generateApplicationErrorAcknowledgementMessage(hl7Bytes);
- message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
+ exchange.setProperty(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
}
- message.setHeader(MLLP_ACKNOWLEDGEMENT, acknowledgementBytes);
+ exchange.setProperty(MLLP_ACKNOWLEDGEMENT, acknowledgementBytes);
}
public byte[] generateApplicationAcceptAcknowledgementMessage(byte[] hl7MessageBytes) throws Hl7AcknowledgementGenerationException {
@@ -109,7 +109,7 @@ public class Hl7AcknowledgementGenerator implements Processor {
// Build the MSH Segment
ByteArrayOutputStream acknowledgement = new ByteArrayOutputStream(1024);
- acknowledgement.write(hl7MessageBytes, 0, 8); // through MSH-2 (without trailing field separator)
+ acknowledgement.write(hl7MessageBytes, 0, fieldSeparatorIndexes.get(1)); // through MSH-2 (without trailing field separator)
acknowledgement.write(hl7MessageBytes, fieldSeparatorIndexes.get(3), fieldSeparatorIndexes.get(4) - fieldSeparatorIndexes.get(3)); // MSH-5
acknowledgement.write(hl7MessageBytes, fieldSeparatorIndexes.get(4), fieldSeparatorIndexes.get(5) - fieldSeparatorIndexes.get(4)); // MSH-6
acknowledgement.write(hl7MessageBytes, fieldSeparatorIndexes.get(1), fieldSeparatorIndexes.get(2) - fieldSeparatorIndexes.get(1)); // MSH-3