Removed extra CBS shutdown

Author: annatisch

uamqp/_async/client_async.py

@@ -232,18 +232,14 @@ async def close_async(self):
         if not self._session:
             return  # already closed.
         else:
-            if self._connection.cbs and not self._ext_connection:
-                _logger.debug("Closing CBS session.")
-                await self._auth.close_authenticator_async()
-                self._connection.cbs = None
-            elif not self._connection.cbs:
+            if not self._connection.cbs:
                 _logger.debug("Closing non-CBS session.")
                 await self._session.destroy_async()
             else:
-                _logger.debug("Not closing CBS session.")
+                _logger.debug("CBS session pending.")
             self._session = None
             if not self._ext_connection:
-                _logger.debug("Closing unshared connection.")
+                _logger.debug("Closing exclusive connection.")
                 await self._connection.destroy_async()
             else:
                 _logger.debug("Shared connection remaining open.")

uamqp/client.py

@@ -255,18 +255,14 @@ def close(self):
         if not self._session:
             return  # already closed.
         else:
-            if self._connection.cbs and not self._ext_connection:
-                _logger.debug("Closing CBS session.")
-                self._auth.close_authenticator()
-                self._connection.cbs = None
-            elif not self._connection.cbs:
+            if not self._connection.cbs:
                 _logger.debug("Closing non-CBS session.")
                 self._session.destroy()
             else:
-                _logger.debug("Not closing CBS session.")
+                _logger.debug("CBS session pending.")
             self._session = None
             if not self._ext_connection:
-                _logger.debug("Closing unshared connection.")
+                _logger.debug("Closing exclusive connection.")
                 self._connection.destroy()
             else:
                 _logger.debug("Shared connection remaining open.")