Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 27 insertions, 6 deletions

diff --git a/src/DotNetOpenId/Yadis/ServiceElement.cs b/src/DotNetOpenId/Yadis/ServiceElement.cs
index 3fce480..21837e1 100644
--- a/src/DotNetOpenId/Yadis/ServiceElement.cs
+++ b/src/DotNetOpenId/Yadis/ServiceElement.cs
@@ -13,8 +13,11 @@ namespace DotNetOpenId.Yadis {
 			get { return (XrdElement)ParentNode; }

 		}

 

-		public int Priority {

-			get { return Node.SelectSingleNode("@priority", XmlNamespaceResolver).ValueAsInt; }

+		public int? Priority {

+			get {

+				XPathNavigator n = Node.SelectSingleNode("@priority", XmlNamespaceResolver);

+				return n != null ? n.ValueAsInt : (int?)null;

+			}

 		}

 

 		public IEnumerable<UriElement> UriElements {

@@ -41,7 +44,7 @@ namespace DotNetOpenId.Yadis {
 				XPathNodeIterator types = Node.Select("xrd:Type", XmlNamespaceResolver);

 				string[] typeUris = new string[types.Count];

 				int i = 0;

-				foreach(XPathNavigator type in types) {

+				foreach (XPathNavigator type in types) {

 					typeUris[i++] = type.Value;

 				}

 				return typeUris;

@@ -50,16 +53,34 @@ namespace DotNetOpenId.Yadis {
 

 		public Identifier ProviderLocalIdentifier {

 			get {

-				var n = Node.SelectSingleNode("xrd:LocalID", XmlNamespaceResolver) 

+				var n = Node.SelectSingleNode("xrd:LocalID", XmlNamespaceResolver)

 					?? Node.SelectSingleNode("openid10:Delegate", XmlNamespaceResolver);

-				return (n != null) ? n.Value : null;

+				if (n != null && n.Value != null) {

+					string value = n.Value.Trim();

+					if (value.Length > 0) {

+						return n.Value;

+					}

+				}

+

+				return null;

 			}

 		}

 

 		#region IComparable<ServiceElement> Members

 

 		public int CompareTo(ServiceElement other) {

-			return Priority.CompareTo(other.Priority);

+			if (other == null) return -1;

+			if (Priority.HasValue && other.Priority.HasValue) {

+				return Priority.Value.CompareTo(other.Priority.Value);

+			} else {

+				if (Priority.HasValue) {

+					return -1;

+				} else if (other.Priority.HasValue) {

+					return 1;

+				} else {

+					return 0;

+				}

+			}

 		}

 

 		#endregion