Used Enumerable.SingleOrDefault instead of Enumerable.Single, in orde…

…r to avoid a try/catch block.
GreanTech · Sep 26, 2014 · 3bb1136 · 3bb1136
1 parent 1758161
commit 3bb1136
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/AtomEventStore/TypeResolutionTable.cs b/AtomEventStore/TypeResolutionTable.cs
@@ -78,24 +78,19 @@ public Type Resolve(string localName, string xmlNamespace)
             if (xmlNamespace == null)
                 throw new ArgumentNullException("xmlNamespace");
 
-            try
-            {
-                return this.entries
-                    .Single(x =>
-                        x.LocalName == localName &&
-                        x.XmlNamespace == xmlNamespace)
-                    .ResolvedType;
-            }
-            catch (InvalidOperationException e)
-            {
+            var result = this.entries
+                .SingleOrDefault(x =>
+                    x.LocalName == localName &&
+                    x.XmlNamespace == xmlNamespace);
+
+            if (result == null)
                 throw new ArgumentException(
                     string.Format(
                         System.Globalization.CultureInfo.CurrentCulture,
                         "The provided local name ({0}) and XML namespace ({1}) could not be mapped to a proper type.",
                         localName,
-                        xmlNamespace),
-                    e);
-            }
+                        xmlNamespace));
+            return result.ResolvedType;
         }
 
         /// <summary>