Merge pull request #24 from kmbotts/NPE-when-short-polling-a-virtual-…

…queue Auto-boxing null Integer to long causing NPE
awslabs · Jan 3, 2020 · 87266b9 · 87266b9
2 parents f22cf6d + f438e6b
commit 87266b9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/com/amazonaws/services/sqs/AmazonSQSVirtualQueuesClient.java b/src/main/java/com/amazonaws/services/sqs/AmazonSQSVirtualQueuesClient.java
@@ -349,7 +349,7 @@ public ReceiveMessageResult receiveMessage(ReceiveMessageRequest request) {
  try {
  try {
  return receiveBuffer.receiveMessageAsync(request)
- .get(request.getWaitTimeSeconds(), TimeUnit.SECONDS);
+ .get(Optional.ofNullable(request.getWaitTimeSeconds()).orElse(0).longValue(), TimeUnit.SECONDS);
  } catch (TimeoutException e) {
  // Fall through to an empty receive
  } catch (ExecutionException e) {

diff --git a/src/test/java/com/amazonaws/services/sqs/AmazonSQSVirtualQueuesClientIT.java b/src/test/java/com/amazonaws/services/sqs/AmazonSQSVirtualQueuesClientIT.java
@@ -63,4 +63,22 @@ public void expiringVirtualQueue() throws InterruptedException {
  // Expected
  }
  }
+
+ @Test
+ public void ReceiveMessageWaitTimeSecondsNull() {
+ CreateQueueRequest request = new CreateQueueRequest()
+ .withQueueName("ReceiveMessageWaitTimeSecondsNull")
+ .addAttributesEntry(AmazonSQSVirtualQueuesClient.VIRTUAL_QUEUE_HOST_QUEUE_ATTRIBUTE, hostQueueUrl)
+ .addAttributesEntry(AmazonSQSIdleQueueDeletingClient.IDLE_QUEUE_RETENTION_PERIOD, "5");
+ String virtualQueueUrl = client.createQueue(request).getQueueUrl();
+
+ // Do Receive message request with null WaitTimeSeconds.
+ ReceiveMessageRequest receiveRequest = new ReceiveMessageRequest()
+ .withQueueUrl(virtualQueueUrl);
+ try {
+ assertEquals(0, client.receiveMessage(receiveRequest).getMessages().size());
+ } catch (NullPointerException npe) {
+ fail("NPE not expected with null WaitTimeSeconds on ReceiveMessageRequest");
+ }
+ }
 }