From bca5e5094949f3c880bb2a5ff934e58475990366 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 29 Mar 2010 17:46:01 +0000
Subject: [PATCH] INT-1053 DatagramPacketMessageMapper must now use
 UUID.fromString(..) when mapping to the Message ID value.

---
 .../integration/ip/udp/DatagramPacketMessageMapper.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
index abb45fb305..b1cfd3bfbe 100644
--- a/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
+++ b/org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
@@ -19,6 +19,7 @@ package org.springframework.integration.ip.udp;
 import java.io.UnsupportedEncodingException;
 import java.net.DatagramPacket;
 import java.nio.ByteBuffer;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -186,7 +187,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper<Datagra
 					payload = new byte[length];
 					System.arraycopy(packet.getData(), offset + matcher.end(), payload, 0, length);
 					message = MessageBuilder.withPayload(payload)
-							.setHeader(MessageHeaders.ID, matcher.group(2))
+							.setHeader(MessageHeaders.ID, UUID.fromString(matcher.group(2)))
 							.setHeader(IpHeaders.ACK_ADDRESS, matcher.group(1))
 							.setHeader(IpHeaders.HOSTNAME, packet.getAddress().getHostName())
 							.setHeader(IpHeaders.IP_ADDRESS, packet.getAddress().getHostAddress())