port changes to sb (Azure#33053)

Author: l0lawrence

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py

@@ -747,7 +747,7 @@ async def _client_run_async(self, **kwargs):
         :rtype: bool
         """
         try:
-            if self._link.current_link_credit == 0:
+            if self._link.current_link_credit <= 0:
                 await self._link.flow(link_credit=self._link_credit)
             await self._connection.listen(wait=self._socket_timeout, **kwargs)
         except ValueError:

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_receiver_async.py

@@ -57,9 +57,11 @@ async def _incoming_attach(self, frame):
     async def _incoming_transfer(self, frame):
         if self.network_trace:
             _LOGGER.debug("<- %r", TransferFrame(payload=b"***", *frame[:-1]), extra=self.network_trace_params)
-        self.current_link_credit -= 1
         self.delivery_count += 1
         self.received_delivery_id = frame[1] # delivery_id
+        # If more is false --> this is the last frame of the message
+        if not frame[5]:
+            self.current_link_credit -= 1
         if self.received_delivery_id is not None:
             self._first_frame = frame
         if not self.received_delivery_id and not self._received_payload:

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/client.py

@@ -851,7 +851,7 @@ def _client_run(self, **kwargs):
         :rtype: bool
         """
         try:
-            if self._link.current_link_credit == 0:
+            if self._link.current_link_credit <= 0:
                 self._link.flow(link_credit=self._link_credit)
             self._connection.listen(wait=self._socket_timeout, **kwargs)
         except ValueError:

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/receiver.py

@@ -54,7 +54,9 @@ def _incoming_attach(self, frame):
     def _incoming_transfer(self, frame):
         if self.network_trace:
             _LOGGER.debug("<- %r", TransferFrame(payload=b"***", *frame[:-1]), extra=self.network_trace_params)
-        self.current_link_credit -= 1
+        # If more is false --> this is the last frame of the message
+        if not frame[5]:
+            self.current_link_credit -= 1
         self.delivery_count += 1
         self.received_delivery_id = frame[1]  # delivery_id
         if self.received_delivery_id is not None: