Merge pull request #7 from xyting/develop

Develop
rigofunc · Jan 10, 2017 · 66093fc · 66093fc
2 parents f51ab04 + 6ba1ae1
commit 66093fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/NpoiExtension.cs b/src/NpoiExtension.cs
@@ -291,7 +291,7 @@ private static IWorkbook InitializeWorkbook(string excelFile)
             var setting = Excel.Setting;
             if (setting.UserXlsx)
             {
-                if (!string.IsNullOrEmpty(excelFile) || File.Exists(excelFile))
+                if (!string.IsNullOrEmpty(excelFile) && File.Exists(excelFile))
                 {
                     using (var file = new FileStream(excelFile, FileMode.Open, FileAccess.Read))
                     {
@@ -305,7 +305,7 @@ private static IWorkbook InitializeWorkbook(string excelFile)
             }
             else
             {
-                if (!string.IsNullOrEmpty(excelFile) || File.Exists(excelFile))
+                if (!string.IsNullOrEmpty(excelFile) && File.Exists(excelFile))
                 {
                     using (var file = new FileStream(excelFile, FileMode.Open, FileAccess.Read))
                     {

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]