Merge pull request #897 from nicopizzo/main

abuzuhri · web-flow · commit 2a18f5b0a42a · 2025-10-24T07:32:02.000+02:00
Fixed null exception when SQS has no messages. (Issue #883)
diff --git a/Source/FikaAmazonAPI/Services/NotificationService.cs b/Source/FikaAmazonAPI/Services/NotificationService.cs
@@ -136,18 +136,18 @@ public async Task StartReceivingNotificationMessagesAsync(ParameterMessageReceiv
                     try
                     {
                         var result = await amazonSQSClient.ReceiveMessageAsync(receiveMessageRequest, cancellationToken);
-                        var Messages = result.Messages;
+                        var Messages = result.Messages ?? new List<Message>();
                         if (Messages.Count > 0)
                         {
                             foreach (var msg in Messages)
                             {
                                 ProcessAnyOfferChangedMessage(msg, messageReceiver, amazonSQSClient, SQS_URL, isDeleteNotificationAfterRead, cancellationToken).ConfigureAwait(false);
 
                             }
-
-                            if (Messages.Count < 10)
-                                Thread.Sleep(1000 * 5);
                         }
+
+                        if (Messages.Count < 10)
+                            Thread.Sleep(1000 * 5);
                     }
                     catch (Exception ex)
                     {

Original file line number	Diff line number	Diff line change
`@@ -136,18 +136,18 @@ public async Task StartReceivingNotificationMessagesAsync(ParameterMessageReceiv`
`136`	`136`	`try`
`137`	`137`	`{`
`138`	`138`	`var result = await amazonSQSClient.ReceiveMessageAsync(receiveMessageRequest, cancellationToken);`
`139`		`- var Messages = result.Messages;`
	`139`	`+ var Messages = result.Messages ?? new List<Message>();`
`140`	`140`	`if (Messages.Count > 0)`
`141`	`141`	`{`
`142`	`142`	`foreach (var msg in Messages)`
`143`	`143`	`{`
`144`	`144`	`ProcessAnyOfferChangedMessage(msg, messageReceiver, amazonSQSClient, SQS_URL, isDeleteNotificationAfterRead, cancellationToken).ConfigureAwait(false);`
`145`	`145`
`146`	`146`	`}`
`147`		`-`
`148`		`- if (Messages.Count < 10)`
`149`		`- Thread.Sleep(1000 * 5);`
`150`	`147`	`}`
	`148`	`+`
	`149`	`+ if (Messages.Count < 10)`
	`150`	`+ Thread.Sleep(1000 * 5);`
`151`	`151`	`}`
`152`	`152`	`catch (Exception ex)`
`153`	`153`	`{`