Merge pull request #142 from jagdev-aws/bug/receive-message

Fix receive message operation for customers using older versions of Extended Client

Author: jagdev-aws

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>amazon-sqs-java-extended-client-lib</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.6</version>
   <packaging>jar</packaging>
   <name>Amazon SQS Extended Client Library for Java</name>
   <description>An extension to the Amazon SQS client that enables sending and receiving messages up to 2GB via Amazon S3.

src/main/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedClient.java

@@ -365,7 +365,7 @@ public ReceiveMessageResult receiveMessage(ReceiveMessageRequest receiveMessageR
             Optional<String> largePayloadAttributeName = getReservedAttributeNameIfPresent(message.getMessageAttributes());
             if (largePayloadAttributeName.isPresent()) {
                 String largeMessagePointer = message.getBody();
-                largeMessagePointer = largeMessagePointer.replace("com.amazon.sqs.javamessaging.MessageS3Pointer", "software.amazon.payloadoffloading.PayloadS3Pointer");
+                largeMessagePointer = largeMessagePointer.replaceFirst("com\\.(amazon|amazonaws)\\.(sqs|services)\\.(javamessaging|extendedmessaging).MessageS3Pointer", "software.amazon.payloadoffloading.PayloadS3Pointer");
 
                 final String originalBody;
                 try {