fix nullpointer

fiskaltrust · Sep 30, 2024 · 8327a69 · 8327a69
1 parent 4960059
commit 8327a69
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/queue/src/fiskaltrust.Middleware.Localization.QueueDE/Repositories/DailyClosingRepository.cs b/queue/src/fiskaltrust.Middleware.Localization.QueueDE/Repositories/DailyClosingRepository.cs
@@ -38,7 +38,11 @@ public async Task<List<DailyClosingReceipt>> GetAsync()
                     ? await GetQueueItemOfMissingIdAsync(aj).ConfigureAwait(false)
                     : await _queueItemRepository.GetAsync(aj.ftQueueItemId).ConfigureAwait(false);
 
-                var closingNumber = JsonConvert.DeserializeAnonymousType(aj.DataJson, new JObject()).Property("closingNumber")?.Value.Value<long?>();
+                long? closingNumber = null;
+                if (aj.DataJson != null && aj.DataJson.Contains("closingNumber"))
+                {
+                    closingNumber = JsonConvert.DeserializeAnonymousType(aj.DataJson, new JObject()).Property("closingNumber")?.Value.Value<long?>();
+                }
                 if(closingNumber == null)
                 {
                     var response = JsonConvert.DeserializeObject<ReceiptResponse>(queueItem.response);

diff --git a/queue/src/fiskaltrust.Middleware.Queue.EF/version.json b/queue/src/fiskaltrust.Middleware.Queue.EF/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.63",
+  "version": "1.3.64",
   "releaseBranches": [
     "^refs/tags/queue/ef/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/queue/src/fiskaltrust.Middleware.Queue.InMemory/version.json b/queue/src/fiskaltrust.Middleware.Queue.InMemory/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.63",
+  "version": "1.3.64",
   "releaseBranches": [
     "^refs/tags/queue/inmemory/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/queue/src/fiskaltrust.Middleware.Queue.MySQL/version.json b/queue/src/fiskaltrust.Middleware.Queue.MySQL/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.63",
+  "version": "1.3.64",
   "releaseBranches": [
     "^refs/tags/queue/mysql/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/queue/src/fiskaltrust.Middleware.Queue.PostgreSQL/version.json b/queue/src/fiskaltrust.Middleware.Queue.PostgreSQL/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.63",
+  "version": "1.3.64",
   "releaseBranches": [
     "^refs/tags/queue/postgresql/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/queue/src/fiskaltrust.Middleware.Queue.SQLite/version.json b/queue/src/fiskaltrust.Middleware.Queue.SQLite/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.63",
+  "version": "1.3.64",
   "releaseBranches": [
     "^refs/tags/queue/sqlite/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/queue/src/fiskaltrust.Middleware.Storage.MySQL/Repositories/MySQLQueueItemRepository.cs b/queue/src/fiskaltrust.Middleware.Storage.MySQL/Repositories/MySQLQueueItemRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using Dapper;
@@ -159,6 +160,10 @@ public async Task<ftQueueItem> GetClosestPreviousReceiptReferencesAsync(ftQueueI
             {
                 await connection.OpenAsync().ConfigureAwait(false);
                 var entry =  await connection.QueryFirstOrDefaultAsync<ftQueueItem>(query, new { ftQueueItem.ftQueueRow, receiptRequest.cbPreviousReceiptReference }).ConfigureAwait(false);
+                if (entry == null)
+                {
+                    return null;
+                }
                 var request = JsonConvert.DeserializeObject<ReceiptRequest>(entry.request);
                 if (request.IncludeInReferences())
                 {