Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -95,14 +95,14 @@ namespace System.ServiceModel.Security
header_types = new ReadOnlyCollection<XmlQualifiedName> (header_types);
}
public void Union (MessagePartSpecification other)
public void Union (MessagePartSpecification specification)
{
if (other == null)
throw new ArgumentNullException ("other");
if (specification == null)
throw new ArgumentNullException ("specification");
if (header_types.IsReadOnly)
throw new InvalidOperationException ("This MessagePartSpecification is read-only.");
body |= other.body;
foreach (XmlQualifiedName q in other.header_types)
body |= specification.body;
foreach (XmlQualifiedName q in specification.header_types)
// Sigh. It could be much better here.
//if (!header_types.Contains (q))
header_types.Add (q);