Modules.Jobs: Version 2.6.1.0

Jobs/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("2.6.0.0")>
+<Assembly: AssemblyTrademark("2.6.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("2.6.0.0")>
-<Assembly: AssemblyFileVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("2.6.1.0")>
+<Assembly: AssemblyFileVersion("2.6.1.0")>

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -370,21 +370,22 @@ Public Class ImportZUGFeRDFiles
                     _logger.Warn("Unknown Error occurred: {0}", ex.Message)
                     _logger.Error(ex)
 
-                    ' Send Email to Digital Data
-                    Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
-                    Dim oEmailData As New EmailData With {
-                        .From = oArgs.ExceptionEmailAddress,
-                        .Subject = $"UnhandledException im ZUGFeRD-Parser @ {oMessageId}"
-                    }
-                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
-
-                    ' Rollback Transaction
-                    oSQLTransaction.Rollback()
-
                     oMoveDirectory = DIRECTORY_DONT_MOVE
-
                     oExpectedError = False
 
+                    If oSQLConnection IsNot Nothing And oSQLTransaction IsNot Nothing Then
+                        ' Send Email to Digital Data
+                        Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
+                        Dim oEmailData As New EmailData With {
+                            .From = oArgs.ExceptionEmailAddress,
+                            .Subject = $"UnhandledException im ZUGFeRD-Parser @ {oMessageId}"
+                        }
+                        _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
+
+                        ' Rollback Transaction
+                        oSQLTransaction.Rollback()
+                    End If
+
                 Finally
                     Try
                         ' If an application error occurred, dont move files so they will be processed again later
@@ -414,8 +415,10 @@ Public Class ImportZUGFeRDFiles
                         ' finally commit all changes To the Database
                         ' ==================================================================
                         If oIsSuccess Or oExpectedError Then
-                            ' Commit Transaction
-                            oSQLTransaction.Commit()
+                            If oSQLTransaction IsNot Nothing Then
+                                ' Commit Transaction
+                                oSQLTransaction.Commit()
+                            End If
                         End If
                     Catch ex As Exception
                         _logger.Error(ex)
@@ -423,7 +426,9 @@ Public Class ImportZUGFeRDFiles
                     End Try
 
                     Try
-                        oSQLConnection.Close()
+                        If oSQLConnection IsNot Nothing Then
+                            oSQLConnection.Close()
+                        End If
                     Catch ex As Exception
                         _logger.Error(ex)
                         _logger.Warn("Database Connections were not closed successfully.")