2005-06-15 Gonzalo Paniagua Javier <[email protected]>

	* TemplateControlCompiler.cs: if the property is not found, don't forget
	about trying the field.


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

mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,8 @@
+2005-06-15 Gonzalo Paniagua Javier <[email protected]>
+
+	* TemplateControlCompiler.cs: if the property is not found, don't forget
+	about trying the field.
+
 2005-06-13  Lluis Sanchez Gual <[email protected]>
 
 	* Directive.cs: Register the MasterType directive.

mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs

@@ -334,15 +334,19 @@ namespace System.Web.Compilation
 
 		static MemberInfo GetFieldOrProperty (Type type, string name)
 		{
+			MemberInfo member = null;
 			try {
-				return type.GetProperty (name, noCaseFlags);
+				member = type.GetProperty (name, noCaseFlags);
 			} catch {}
+			
+			if (member != null)
+				return member;
 
 			try {
-				return type.GetField (name, noCaseFlags);
+				member = type.GetField (name, noCaseFlags);
 			} catch {}
 
-			return null;
+			return member;
 		}
 
 		bool ProcessPropertiesAndFields (ControlBuilder builder, MemberInfo member, string id,