fix(iot-dev): Fix SDK leaking apache qpid objects after unregistering…

… a device (#1501) #1478 The reactor instance still held onto the last scheduled SAS token renewal task for an unregistered device when it needed to be cancelled, and the sessions and links needed to be free'd after they were closed.
Azure · Mar 23, 2022 · 801f3c8 · 801f3c8
1 parent 0dd8b24
commit 801f3c8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/...ain/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsReceiverLinkHandler.java b/...ain/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsReceiverLinkHandler.java
@@ -321,5 +321,7 @@ private void clearHandlers()
             childrenIterator.next();
             childrenIterator.remove();
         }
+
+        this.receiverLink.free();
     }
 }
diff --git a/.../java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSasTokenRenewalHandler.java b/.../java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSasTokenRenewalHandler.java
@@ -136,6 +136,7 @@ private void clearHandlers()
     {
         if (this.scheduledTask != null)
         {
+            this.scheduledTask.cancel();
             this.scheduledTask.attachments().clear();
         }
 

diff --git a/.../main/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSenderLinkHandler.java b/.../main/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSenderLinkHandler.java
@@ -335,5 +335,7 @@ private void clearHandlers()
             childrenIterator.next();
             childrenIterator.remove();
         }
+
+        this.senderLink.free();
     }
 }
diff --git a/...src/main/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSessionHandler.java b/...src/main/java/com/microsoft/azure/sdk/iot/device/transport/amqps/AmqpsSessionHandler.java
@@ -569,5 +569,7 @@ private void clearHandlers()
             childrenIterator.next();
             childrenIterator.remove();
         }
+
+        this.session.free();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,6 +136,7 @@ private void clearHandlers() @@
         {
             if (this.scheduledTask != null)
             {
+                this.scheduledTask.cancel();
                 this.scheduledTask.attachments().clear();
             }
@@ Expand Down @@