Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Mono 2 8 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Dec 4, 2010
Merged

Mono 2 8 #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions mcs/class/System.ServiceModel.Web/System/UriTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,28 +138,36 @@ Uri BindByNameCommon (Uri baseAddress, NameValueCollection nvc, IDictionary<stri

int src = 0;
StringBuilder sb = new StringBuilder (template.Length);
BindByName (ref src, sb, path, nvc, dic, omitDefaults);
BindByName (ref src, sb, query, nvc, dic, omitDefaults);
BindByName (ref src, sb, path, nvc, dic, omitDefaults, false);
BindByName (ref src, sb, query, nvc, dic, omitDefaults, true);
sb.Append (template.Substring (src));
return new Uri (baseAddress.ToString () + sb.ToString ());
}

void BindByName (ref int src, StringBuilder sb, ReadOnlyCollection<string> names, NameValueCollection nvc, IDictionary<string,string> dic, bool omitDefaults)
void BindByName (ref int src, StringBuilder sb, ReadOnlyCollection<string> names, NameValueCollection nvc, IDictionary<string,string> dic, bool omitDefaults, bool query)
{
foreach (string name in names) {
int s = template.IndexOf ('{', src);
int e = template.IndexOf ('}', s + 1);
sb.Append (template.Substring (src, s - src));
#if NET_2_1
string value = null;
#else
string value = nvc != null ? nvc [name] : null;
#endif
if (dic != null)
dic.TryGetValue (name, out value);
if (value == null && (omitDefaults || !Defaults.TryGetValue (name, out value)))
throw new ArgumentException (String.Format ("The argument name value collection does not contain non-null value for '{0}'", name), "parameters");
sb.Append (value);
if (query) {
if (value != null || (!omitDefaults && Defaults.TryGetValue (name, out value))) {
sb.Append (template.Substring (src, s - src));
sb.Append (value);
}
} else
if (value == null && (omitDefaults || !Defaults.TryGetValue(name, out value)))
throw new ArgumentException(string.Format("The argument name value collection does not contain non-nul vaalue for '{0}'", name), "parameters");
else {
sb.Append (template.Substring (src, s - src));
sb.Append (value);
}
src = e + 1;
}
}
Expand Down