From 12878a8ed7ec61b1d86d1120cd1508cd6769127c Mon Sep 17 00:00:00 2001 From: Bryce Blanton Date: Mon, 8 Nov 2021 13:14:06 -0800 Subject: [PATCH 1/2] Added timeout to CompletableFuture.get() --- .../samples/BasicPubSub/src/main/java/pubsub/PubSub.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java index dc007b2d6..16d3bfc0a 100644 --- a/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java +++ b/aws-iot-device-sdk-java-v2-main/samples/BasicPubSub/src/main/java/pubsub/PubSub.java @@ -27,6 +27,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; public class PubSub { @@ -332,7 +333,7 @@ public void onConnectionResumed(boolean sessionPresent) { int count = 0; while (count++ < messagesToPublish) { CompletableFuture published = connection.publish(new MqttMessage(topic, message.getBytes(), QualityOfService.AT_LEAST_ONCE, false)); - published.get(); + published.get(10, TimeUnit.SECONDS); Thread.sleep(1000); } From 9a88bd58e8f2ad3534f937da4589425320364c09 Mon Sep 17 00:00:00 2001 From: Bryce Blanton Date: Mon, 8 Nov 2021 13:14:45 -0800 Subject: [PATCH 2/2] Added try-with-resources block around dialog --- .../eclipse/explorer/dynamodb/DynamoDBTableNode.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java index 872c52c41..3473b2c22 100644 --- a/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java +++ b/aws-toolkit-eclipse-master/bundles/com.amazonaws.eclipse.dynamodb/src/com/amazonaws/eclipse/explorer/dynamodb/DynamoDBTableNode.java @@ -122,7 +122,7 @@ public void run() { @Override public void run() { /* Show the warning that the table is CREATING/DELETING/UPDATING */ - MessageDialog dialog = new MessageDialog( + try (MessageDialog dialog = new MessageDialog( Display.getCurrent().getActiveShell(), "Cannot open this table", AwsToolkitCore.getDefault() @@ -130,8 +130,9 @@ public void run() { .get(AwsToolkitCore.IMAGE_AWS_ICON), "Cannot open this table(" + tableName + "), since it is in the status of " + tableStatus + ".", MessageDialog.ERROR, - new String[] { "OK" }, 0); - dialog.open(); + new String[] { "OK" }, 0)) { + dialog.open(); + } } }); }