Throwing errors if the sourcefile doesn't exist to avoid a nullpointe…

…r when the Destination is using the reader.
dynamicweb · Jun 26, 2024 · d0bbac8 · d0bbac8
1 parent 3651429
commit d0bbac8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Dynamicweb.DataIntegration.Providers.ExcelProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.ExcelProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.0.16</Version>
+		<Version>10.0.17</Version>
 		<AssemblyVersion>1.0.0</AssemblyVersion>
 		<Title>Excel Provider</Title>
 		<Description>Excel Provider</Description>

diff --git a/src/ExcelProvider.cs b/src/ExcelProvider.cs
@@ -165,18 +165,22 @@ void IDestination.SaveAsXml(XmlTextWriter xmlTextWriter)
             {
                 if (!string.IsNullOrEmpty(WorkingDirectory))
                 {
-                    return new ExcelSourceReader(GetSourceFilePath(), mapping, this);
+                    var sourceFilePath = GetSourceFilePath();
+					if (!File.Exists(sourceFilePath))
+                        throw new Exception($"Source file {SourceFile} does not exist - Working Directory {WorkingDirectory}");
+
+					return new ExcelSourceReader(sourceFilePath, mapping, this);
                 }
                 else
                 {
-                    return new ExcelSourceReader(SourceFile, mapping, this);
+					if (!File.Exists(SourceFile))
+						throw new Exception($"Source file {SourceFile} does not exist - Working Directory {WorkingDirectory}");
+
+					return new ExcelSourceReader(SourceFile, mapping, this);
                 }
             }
             else
-            {
-                Logger?.Error("The file is not a Excel file");
-                return null;
-            }
+				throw new Exception("The file is not a Excel file");
         }
 
         public override void Close()