Fixup weird Array casting dead code in Min/MaxLengthAttribute

dotnet · Jun 19, 2017 · 6259768 · 6259768
1 parent 4721339
commit 6259768
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/src/System.ComponentModel.Annotations/src/Resources/Strings.resx b/src/System.ComponentModel.Annotations/src/Resources/Strings.resx
@@ -133,6 +133,9 @@
   <data name="MinLengthAttribute_ValidationError" xml:space="preserve">
     <value>The field {0} must be a string or array type with a minimum length of '{1}'.</value>
   </data>
+  <data name="LengthAttribute_InvalidValueType" xml:space="preserve">
+    <value>The field of type {0} must be a string, array or ICollection type.</value>
+  </data>
   <data name="PhoneAttribute_Invalid" xml:space="preserve">
     <value>The {0} field is not a valid phone number.</value>
   </data>

diff --git a/...omponentModel.Annotations/src/System/ComponentModel/DataAnnotations/MaxLengthAttribute.cs b/...omponentModel.Annotations/src/System/ComponentModel/DataAnnotations/MaxLengthAttribute.cs
@@ -72,24 +72,19 @@ public override bool IsValid(object value)
             {
                 return true;
             }
-            var str = value as string;
-            if (str != null)
+            if (value is string str)
             {
                 length = str.Length;
             }
             else
             {
-                ICollection collection = value as ICollection;
-
-                if (collection != null)
+                if (value is ICollection collection)
                 {
                     length = collection.Count;
                 }
                 else
                 {
-                    // A cast exception previously occurred if a non-{string|array} property was passed
-                    // in so preserve this behavior if the value does not implement ICollection
-                    length = ((Array)value).Length;
+                    throw new InvalidCastException(SR.Format(SR.LengthAttribute_InvalidValueType, value.GetType()));
                 }
             }
 

diff --git a/...omponentModel.Annotations/src/System/ComponentModel/DataAnnotations/MinLengthAttribute.cs b/...omponentModel.Annotations/src/System/ComponentModel/DataAnnotations/MinLengthAttribute.cs
@@ -56,24 +56,19 @@ public override bool IsValid(object value)
             {
                 return true;
             }
-            var str = value as string;
-            if (str != null)
+            if (value is string str)
             {
                 length = str.Length;
             }
             else
             {
-                ICollection collection = value as ICollection;
-
-                if (collection != null)
+                if (value is ICollection collection)
                 {
                     length = collection.Count;
                 }
                 else
                 {
-                    // A cast exception previously occurred if a non-{string|array} property was passed
-                    // in so preserve this behavior if the value does not implement ICollection
-                    length = ((Array)value).Length;
+                    throw new InvalidCastException(SR.Format(SR.LengthAttribute_InvalidValueType, value.GetType()));
                 }
             }