Merge revision 2791

SVN: trunk@2792

src/NHibernate.Test/NHSpecificTest/ProxyValidator/Fixture.cs

@@ -33,6 +33,30 @@ public virtual void SomeMethod(int arg1, object arg2)
 			}
 
 			public virtual event EventHandler VirtualEvent;
+
+			protected void NonVirtualProtectedMethod()
+			{
+			}
+
+			protected int NonVirtualProtectedProperty
+			{
+				get { return 0; }
+				set { }
+			}
+
+			protected event EventHandler NonVirtualProtectedEvent;
+
+			protected void NonVirtualPrivateMethod()
+			{
+			}
+
+			protected int NonVirtualPrivateProperty
+			{
+				get { return 0; }
+				set { }
+			}
+
+			protected event EventHandler NonVirtualPrivateEvent;
 		}
 
 		[Test]
@@ -144,13 +168,25 @@ internal int NonVirtualProperty
 			}
 		}
 
+		public class InvalidInternalField : ValidClass
+		{
+			internal int internalField;
+		}
+
 		[Test]
 		[ExpectedException(typeof(InvalidProxyTypeException))]
 		public void NonVirtualInternal()
 		{
 			Validate(typeof(InvalidNonVirtualInternalProperty));
 		}
 
+		[Test]
+		[ExpectedException(typeof(InvalidProxyTypeException))]
+		public void InternalField()
+		{
+			Validate(typeof(InvalidInternalField));
+		}
+
 		public class InvalidNonVirtualProtectedProperty : ValidClass
 		{
 			protected int NonVirtualProperty

src/NHibernate/Proxy/ProxyTypeValidator.cs

@@ -80,7 +80,11 @@ private static void CheckAccessibleMembersAreVirtual(System.Type type, IList err
 				}
 				else if (member is FieldInfo && ((FieldInfo)member).IsPublic)
 				{
-					Error(errors, type, "field " + member.Name + " should not be public");
+					FieldInfo memberField = (FieldInfo) member;
+					if (memberField.IsPublic || memberField.IsAssembly || memberField.IsFamilyOrAssembly)
+					{
+						Error(errors, type, "field " + member.Name + " should not be public nor internal");
+					}
 				}
 			}
 		}