Fix the hang due to CRT resources not being cleaned up correctly in s…

…amples (#299)
aws · Jul 26, 2022 · 427f913 · 427f913
1 parent 4b1bdc8
commit 427f913
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 5 deletions.
diff --git a/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java b/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java
@@ -84,6 +84,9 @@ public void onConnectionResumed(boolean sessionPresent) {
             // (see sampleConnectAndDisconnect for implementation)
             cmdUtils.sampleConnectAndDisconnect(connection);
 
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);
         }

diff --git a/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
@@ -127,6 +127,10 @@ public void onConnectionResumed(boolean sessionPresent) {
 
             CompletableFuture<Void> disconnected = connection.disconnect();
             disconnected.get();
+
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);
         }

diff --git a/...ustomAuthorizerConnect/src/main/java/customauthorizerconnect/CustomAuthorizerConnect.java b/...ustomAuthorizerConnect/src/main/java/customauthorizerconnect/CustomAuthorizerConnect.java
@@ -78,6 +78,9 @@ public void onConnectionResumed(boolean sessionPresent) {
             // (see sampleConnectAndDisconnect for implementation)
             cmdUtils.sampleConnectAndDisconnect(connection);
 
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);
         }

diff --git a/samples/Identity/src/main/java/identity/FleetProvisioningSample.java b/samples/Identity/src/main/java/identity/FleetProvisioningSample.java
@@ -170,6 +170,10 @@ public void onConnectionResumed(boolean sessionPresent) {
 
             CompletableFuture<Void> disconnected = connection.disconnect();
             disconnected.get();
+
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             System.out.println("Exception encountered: " + ex.toString());
         }

diff --git a/samples/Jobs/src/main/java/jobs/JobsSample.java b/samples/Jobs/src/main/java/jobs/JobsSample.java
@@ -278,6 +278,10 @@ public void onConnectionResumed(boolean sessionPresent) {
 
             CompletableFuture<Void> disconnected = connection.disconnect();
             disconnected.get();
+
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             System.out.println("Exception encountered: " + ex.toString());
         }

diff --git a/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java b/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java
@@ -142,6 +142,9 @@ public void onConnectionResumed(boolean sessionPresent) {
                     CompletableFuture<Void> disconnected = connection.disconnect();
                     disconnected.get();
                     System.out.println("Disconnected.");
+
+                    // Close the connection now that we are completely done with it.
+                    connection.close();
                 }
             } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
                 onApplicationFailure(ex);

diff --git a/samples/RawConnect/src/main/java/rawconnect/RawConnect.java b/samples/RawConnect/src/main/java/rawconnect/RawConnect.java
@@ -128,6 +128,9 @@ public void onConnectionResumed(boolean sessionPresent) {
                     // Connect and disconnect using the connection we created
                     // (see sampleConnectAndDisconnect for implementation)
                     cmdUtils.sampleConnectAndDisconnect(connection);
+
+                    // Close the connection now that we are completely done with it.
+                    connection.close();
                 }
             }
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {

diff --git a/samples/Shadow/src/main/java/shadow/ShadowSample.java b/samples/Shadow/src/main/java/shadow/ShadowSample.java
@@ -291,6 +291,10 @@ public void onConnectionResumed(boolean sessionPresent) {
 
             CompletableFuture<Void> disconnected = connection.disconnect();
             disconnected.get();
+
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             System.out.println("Exception encountered: " + ex.toString());
         }

diff --git a/samples/Utils/CommandLineUtils/utils/commandlineutils/CommandLineUtils.java b/samples/Utils/CommandLineUtils/utils/commandlineutils/CommandLineUtils.java
@@ -185,7 +185,10 @@ public MqttClientConnection buildPKCS11MQTTConnection(MqttClientConnectionEvents
             buildConnectionSetupCAFileDefaults(builder);
             buildConnectionSetupConnectionDefaults(builder, callbacks);
 
-            return builder.build();
+            MqttClientConnection conn = builder.build();
+            builder.close();
+            return conn;
+
         } catch (CrtRuntimeException ex) {
             return null;
         }
@@ -226,7 +229,9 @@ public MqttClientConnection buildWebsocketX509MQTTConnection(MqttClientConnectio
             X509CredentialsProvider provider = x509builder.build();
             builder.withWebsocketCredentialsProvider(provider);
 
-            return builder.build();
+            MqttClientConnection conn = builder.build();
+            builder.close();
+            return conn;
 
         } catch (CrtRuntimeException ex) {
             return null;
@@ -245,7 +250,9 @@ public MqttClientConnection buildWebsocketMQTTConnection(MqttClientConnectionEve
             builder.withWebsockets(true);
             builder.withWebsocketSigningRegion(getCommandRequired(m_cmd_signing_region, ""));
 
-            return builder.build();
+            MqttClientConnection conn = builder.build();
+            builder.close();
+            return conn;
 
         } catch (CrtRuntimeException ex) {
             return null;
@@ -261,7 +268,10 @@ public MqttClientConnection buildDirectMQTTConnection(MqttClientConnectionEvents
             buildConnectionSetupCAFileDefaults(builder);
             buildConnectionSetupConnectionDefaults(builder, callbacks);
             buildConnectionSetupProxyDefaults(builder);
-            return builder.build();
+
+            MqttClientConnection conn = builder.build();
+            builder.close();
+            return conn;
         }
         catch (CrtRuntimeException ex) {
             return null;
@@ -279,7 +289,10 @@ public MqttClientConnection buildDirectMQTTConnectionWithCustomAuthorizer(MqttCl
                 getCommandOrDefault(m_cmd_custom_auth_authorizer_name, null),
                 getCommandOrDefault(m_cmd_custom_auth_authorizer_signature, null),
                 getCommandOrDefault(m_cmd_custom_auth_password, null));
-            return builder.build();
+
+            MqttClientConnection conn = builder.build();
+            builder.close();
+            return conn;
         }
         catch (CrtRuntimeException | UnsupportedEncodingException ex) {
             return null;

diff --git a/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java b/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java
@@ -77,6 +77,9 @@ public void onConnectionResumed(boolean sessionPresent) {
             // (see sampleConnectAndDisconnect for implementation)
             cmdUtils.sampleConnectAndDisconnect(connection);
 
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);
         }

diff --git a/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java b/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java
@@ -91,6 +91,9 @@ public void onConnectionResumed(boolean sessionPresent) {
                 // Connect and disconnect using the connection we created
                 // (see sampleConnectAndDisconnect for implementation)
                 cmdUtils.sampleConnectAndDisconnect(connection);
+
+                // Close the connection now that we are completely done with it.
+                connection.close();
             }
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);

diff --git a/...rConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java b/...rConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java
@@ -77,6 +77,9 @@ public void onConnectionResumed(boolean sessionPresent) {
             // (see sampleConnectAndDisconnect for implementation)
             cmdUtils.sampleConnectAndDisconnect(connection);
 
+            // Close the connection now that we are completely done with it.
+            connection.close();
+
         } catch (CrtRuntimeException | InterruptedException | ExecutionException ex) {
             onApplicationFailure(ex);
         }