Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Modules.Interfaces/ZUGFeRDInterface/PDFAttachments.vb

@@ -77,7 +77,7 @@ Public Class PDFAttachments
         End Try
     End Function
 
-    Private Function DoExtract(GDPicturePDF As GdPicturePDF, Extensions As List(Of String)) As List(Of AttachmentResult)
+    Private Function DoExtract(GDPicturePDF As GdPicturePDF, pExtensions As List(Of String)) As List(Of AttachmentResult)
         Dim oResults As New List(Of AttachmentResult)
         Dim oEmbeddedFileCount As Integer = GDPicturePDF.GetEmbeddedFileCount()
 
@@ -92,7 +92,7 @@ Public Class PDFAttachments
                         Logger.Debug("Extracting embedded file [{0}]", oFileName)
 
                         Dim oExtension = New FileInfo(oFileName).Extension.ToUpper.Substring(1)
-                        If Extensions.Contains(oExtension) Then
+                        If pExtensions.Contains(oExtension) Then
                             Dim oFileSize As Integer = GDPicturePDF.GetEmbeddedFileSize(oIndex)
 
                             If GDPicturePDF.GetStat() = GdPictureStatus.OK Then

Modules.Windream/Windream.vb

@@ -1161,9 +1161,16 @@ Public Class Windream
             _logger.Warn("File '{0}' does not exist", Path)
             Return False
         End If
+        Dim oWMObject As IWMObject6
 
-        Dim oWMObject As IWMObject6 = GetFileByPath(Path)
-
+        Try
+            oWMObject = GetFileByPath(Path)
+        Catch ex As Exception
+            _logger.Warn("Could not create a WMObject for path '{0}'!!", Path)
+            _logger.Warn(ex.Message)
+            Return False
+        End Try
+        _logger.Debug("SetFileIndex '{0}' ... ", IndexName)
         If LockObject(oWMObject, WMObjectEditModeIndexEdit) = False Then
             _logger.Warn("File {0} could not be locked")
             Return False