2007-11-03 Marek Habersack <[email protected]>

	* SimpleWebHandlerParser.cs: don't NRE on a null assembly passed
	to AddAssembly.
	AddAssemblyByName must check the return value of
	Assembly.LoadWithPartialName, as the method doesn't throw on
	missing assembly, it returns null instead.

svn path=/trunk/mcs/; revision=88761

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,5 +1,11 @@
 2007-11-03  Marek Habersack  <[email protected]>
 
+	* SimpleWebHandlerParser.cs: don't NRE on a null assembly passed
+	to AddAssembly.
+	AddAssemblyByName must check the return value of
+	Assembly.LoadWithPartialName, as the method doesn't throw on
+	missing assembly, it returns null instead.
+
 	* ClientScriptManager.cs: eventValidationArray is serialized in an
 	optimized fashion, so that its serialized form occupies only as
 	many slots as were actually used. It may result in that an array

mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs

@@ -289,6 +289,9 @@ namespace System.Web.UI
 
 		internal virtual void AddAssembly (Assembly assembly, bool fullPath)
 		{
+			if (assembly == null)
+				throw new ArgumentNullException ("assembly");
+			
 			if (anames == null)
 				anames = new Hashtable ();
 
@@ -329,12 +332,17 @@ namespace System.Web.UI
 				return assembly;
 			}
 
+			Exception ex = null;
 			try {
 				assembly = Assembly.LoadWithPartialName (name);
 			} catch (Exception e) {
-				throw new ParseException (location, "Assembly " + name + " not found", e);
+				ex = null;
+				assembly = null;
 			}
 
+			if (assembly == null)
+				throw new ParseException (location, String.Format ("Assembly '{0}' not found", name), ex);
+			
 			AddAssembly (assembly, true);
 			return assembly;
 		}