Rewind new strategy for freeing links.

A corrected implementation will be provided afterwards.

Signed-off-by: Karsten Frank <Karsten.Frank@bosch-si.com>

client/src/main/java/org/eclipse/hono/client/impl/AbstractHonoClient.java

@@ -242,19 +242,37 @@ protected final void closeLinks(final Handler<AsyncResult<Void>> closeHandler) {
             if (sender == null) {
                 senderCloseHandler.complete();
             } else {
-                sender.close();
-                // free resources even if remote peer did not reply with a detach frame
-                sender.free();
+                final Handler<AsyncResult<ProtonSender>> wrappedHandler = HonoProtonHelper.setCloseHandler(sender, closeAttempt -> {
+                    LOG.debug("closed message sender for [{}]", sender.getTarget().getAddress());
+                    senderCloseHandler.complete();
+                });
+                if (sender.isOpen()) {
+                    // wait for peer's detach frame to trigger the handler
+                    sender.close();
+                } else {
+                    // trigger handler manually to make sure that
+                    // resources are freed up
+                    wrappedHandler.handle(Future.succeededFuture());
+                }
             }
 
             senderCloseHandler.compose(closedSender -> {
 
                 if (receiver == null) {
                     result.complete((Void) null);
                 } else {
-                    receiver.close();
-                    // free resources even if remote peer did not reply with a detach frame
-                    receiver.free();
+                    final Handler<AsyncResult<ProtonReceiver>> wrappedHandler = HonoProtonHelper.setCloseHandler(receiver, closeAttempt -> {
+                        LOG.debug("closed message consumer for [{}]", receiver.getSource().getAddress());
+                        result.complete((Void) null);
+                    });
+                    if (receiver.isOpen()) {
+                        // wait for peer's detach frame to trigger the handler
+                        receiver.close();
+                    } else {
+                        // trigger handler manually to make sure that
+                        // resources are freed up
+                        wrappedHandler.handle(Future.succeededFuture());
+                    }
                 }
 
             }, result);