Installation fix: Setup fails with exception "Value cannot be null. Parameter name: stream" on certain environments

Author: muratcakir

changelog.md

@@ -5,6 +5,7 @@
 ###Bugfixes###
 * IMPORTANT FIX: Memory leak leads to _OutOfMemoryException_ in application after a while
 * Installation fix: some varchar(MAX) columns get created as varchar(4000). Added a migration to fix the column specs.
+* Installation fix: Setup fails with exception _Value cannot be null. Parameter name: stream_
 * Bugfix for stock issue in product variant combinations
 * #336 Product bundle: Upper add-to-cart button label shows wrong text
 * #338 Serialization exception thrown when session state mode is _StateServer_

src/Libraries/SmartStore.Core/Data/SqlFileTokenizer.cs

@@ -44,7 +44,7 @@ public IEnumerable<string> Tokenize()
 		{
 			if (this.Assembly == null)
 			{
-				this.Assembly = Assembly.GetCallingAssembly();
+				this.Assembly = Assembly.GetExecutingAssembly();
 			}
 
 			using (var reader = ReadSqlFile())
@@ -67,7 +67,7 @@ protected virtual StreamReader ReadSqlFile()
 				string path = CommonHelper.MapPath(fileName);
 				if (!File.Exists(path))
 				{
-					return StreamReader.Null;
+					throw new FileNotFoundException("Sql file '{0}' not found".FormatInvariant(this.FileName));
 				}
 
 				return new StreamReader(File.OpenRead(path));
@@ -78,9 +78,16 @@ protected virtual StreamReader ReadSqlFile()
 			var asmName = assembly.FullName.Substring(0, assembly.FullName.IndexOf(','));
 			var location = this.Location ?? asmName + ".Sql";
 			var name = String.Format("{0}.{1}", location, fileName);
-			var stream = assembly.GetManifestResourceStream(name);
-			Debug.Assert(stream != null);
-			return new StreamReader(stream);
+
+			try
+			{
+				var stream = assembly.GetManifestResourceStream(name);
+				return new StreamReader(stream);
+			}
+			catch (Exception ex)
+			{
+				throw new FileLoadException("Error while loading embedded sql resource '{0}'".FormatInvariant(name), ex);
+			}
 		}
 
 		private string ReadNextSqlStatement(TextReader reader)

src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs

@@ -20,7 +20,7 @@ public static void SqlFile(this IDbMigration migration, string fileName, Assembl
 		{
 			Guard.ArgumentNotEmpty(() => fileName);
 
-			var tokenizer = new SqlFileTokenizer(fileName, assembly ?? Assembly.GetCallingAssembly(), location);
+			var tokenizer = new SqlFileTokenizer(fileName, assembly ?? Assembly.GetExecutingAssembly(), location);
 			foreach (var cmd in tokenizer.Tokenize())
 			{
 				if (cmd.HasValue())