Skip to content

Commit 7350717

Browse files
author
michael.hallett
committed
updated code for cancellation token disposal
1 parent 60e6882 commit 7350717

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

RestSharp/RestClient.Async.cs

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public virtual RestRequestAsyncHandle ExecuteAsync(IRestRequest request,
3838
#if PocketPC
3939
string method = request.Method.ToString();
4040
#else
41-
string method = Enum.GetName(typeof (Method), request.Method);
41+
string method = Enum.GetName(typeof(Method), request.Method);
4242
#endif
4343

4444
switch (request.Method)
@@ -47,10 +47,10 @@ public virtual RestRequestAsyncHandle ExecuteAsync(IRestRequest request,
4747
case Method.PATCH:
4848
case Method.POST:
4949
case Method.PUT:
50-
return ExecuteAsync(request, callback, method, DoAsPostAsync);
50+
return this.ExecuteAsync(request, callback, method, DoAsPostAsync);
5151

5252
default:
53-
return ExecuteAsync(request, callback, method, DoAsGetAsync);
53+
return this.ExecuteAsync(request, callback, method, DoAsGetAsync);
5454
}
5555
}
5656

@@ -63,7 +63,7 @@ public virtual RestRequestAsyncHandle ExecuteAsync(IRestRequest request,
6363
public virtual RestRequestAsyncHandle ExecuteAsyncGet(IRestRequest request,
6464
Action<IRestResponse, RestRequestAsyncHandle> callback, string httpMethod)
6565
{
66-
return ExecuteAsync(request, callback, httpMethod, DoAsGetAsync);
66+
return this.ExecuteAsync(request, callback, httpMethod, DoAsGetAsync);
6767
}
6868

6969
/// <summary>
@@ -76,25 +76,25 @@ public virtual RestRequestAsyncHandle ExecuteAsyncPost(IRestRequest request,
7676
Action<IRestResponse, RestRequestAsyncHandle> callback, string httpMethod)
7777
{
7878
request.Method = Method.POST; // Required by RestClient.BuildUri...
79-
return ExecuteAsync(request, callback, httpMethod, DoAsPostAsync);
79+
return this.ExecuteAsync(request, callback, httpMethod, DoAsPostAsync);
8080
}
8181

8282
private RestRequestAsyncHandle ExecuteAsync(IRestRequest request,
8383
Action<IRestResponse, RestRequestAsyncHandle> callback, string httpMethod,
8484
Func<IHttp, Action<HttpResponse>, string, HttpWebRequest> getWebRequest)
8585
{
86-
var http = HttpFactory.Create();
86+
var http = this.HttpFactory.Create();
8787

88-
AuthenticateIfNeeded(this, request);
88+
this.AuthenticateIfNeeded(this, request);
8989

90-
ConfigureHttp(request, http);
90+
this.ConfigureHttp(request, http);
9191

9292
var asyncHandle = new RestRequestAsyncHandle();
9393

94-
Action<HttpResponse> response_cb = r => ProcessResponse(request, r, asyncHandle, callback);
94+
Action<HttpResponse> response_cb = r => this.ProcessResponse(request, r, asyncHandle, callback);
9595

9696
#if !PocketPC
97-
if (UseSynchronizationContext && SynchronizationContext.Current != null)
97+
if (this.UseSynchronizationContext && SynchronizationContext.Current != null)
9898
{
9999
var ctx = SynchronizationContext.Current;
100100
var cb = response_cb;
@@ -133,8 +133,8 @@ private void ProcessResponse(IRestRequest request, HttpResponse httpResponse, Re
133133
public virtual RestRequestAsyncHandle ExecuteAsync<T>(IRestRequest request,
134134
Action<IRestResponse<T>, RestRequestAsyncHandle> callback)
135135
{
136-
return ExecuteAsync(request,
137-
(response, asyncHandle) => DeserializeResponse(request, callback, response, asyncHandle));
136+
return this.ExecuteAsync(request,
137+
(response, asyncHandle) => this.DeserializeResponse(request, callback, response, asyncHandle));
138138
}
139139

140140
/// <summary>
@@ -147,8 +147,8 @@ public virtual RestRequestAsyncHandle ExecuteAsync<T>(IRestRequest request,
147147
public virtual RestRequestAsyncHandle ExecuteAsyncGet<T>(IRestRequest request,
148148
Action<IRestResponse<T>, RestRequestAsyncHandle> callback, string httpMethod)
149149
{
150-
return ExecuteAsyncGet(request,
151-
(response, asyncHandle) => DeserializeResponse(request, callback, response, asyncHandle), httpMethod);
150+
return this.ExecuteAsyncGet(request,
151+
(response, asyncHandle) => this.DeserializeResponse(request, callback, response, asyncHandle), httpMethod);
152152
}
153153

154154
/// <summary>
@@ -161,8 +161,8 @@ public virtual RestRequestAsyncHandle ExecuteAsyncGet<T>(IRestRequest request,
161161
public virtual RestRequestAsyncHandle ExecuteAsyncPost<T>(IRestRequest request,
162162
Action<IRestResponse<T>, RestRequestAsyncHandle> callback, string httpMethod)
163163
{
164-
return ExecuteAsyncPost(request,
165-
(response, asyncHandle) => DeserializeResponse(request, callback, response, asyncHandle), httpMethod);
164+
return this.ExecuteAsyncPost(request,
165+
(response, asyncHandle) => this.DeserializeResponse(request, callback, response, asyncHandle), httpMethod);
166166
}
167167

168168
private void DeserializeResponse<T>(IRestRequest request,
@@ -173,7 +173,7 @@ private void DeserializeResponse<T>(IRestRequest request,
173173

174174
try
175175
{
176-
restResponse = Deserialize<T>(request, response);
176+
restResponse = this.Deserialize<T>(request, response);
177177
}
178178
catch (Exception ex)
179179
{
@@ -190,14 +190,14 @@ private void DeserializeResponse<T>(IRestRequest request,
190190
}
191191

192192
#if NET4 || MONODROID || MONOTOUCH || WP8
193-
/// <summary>
194-
/// Executes a GET-style request asynchronously, authenticating if needed
195-
/// </summary>
196-
/// <typeparam name="T">Target deserialization type</typeparam>
197-
/// <param name="request">Request to be executed</param>
193+
/// <summary>
194+
/// Executes a GET-style request asynchronously, authenticating if needed
195+
/// </summary>
196+
/// <typeparam name="T">Target deserialization type</typeparam>
197+
/// <param name="request">Request to be executed</param>
198198
public virtual Task<IRestResponse<T>> ExecuteGetTaskAsync<T>(IRestRequest request)
199199
{
200-
return ExecuteGetTaskAsync<T>(request, CancellationToken.None);
200+
return this.ExecuteGetTaskAsync<T>(request, CancellationToken.None);
201201
}
202202

203203
/// <summary>
@@ -214,7 +214,7 @@ public virtual Task<IRestResponse<T>> ExecuteGetTaskAsync<T>(IRestRequest reques
214214
}
215215

216216
request.Method = Method.GET;
217-
return ExecuteTaskAsync<T>(request, token);
217+
return this.ExecuteTaskAsync<T>(request, token);
218218
}
219219

220220
/// <summary>
@@ -224,7 +224,7 @@ public virtual Task<IRestResponse<T>> ExecuteGetTaskAsync<T>(IRestRequest reques
224224
/// <param name="request">Request to be executed</param>
225225
public virtual Task<IRestResponse<T>> ExecutePostTaskAsync<T>(IRestRequest request)
226226
{
227-
return ExecutePostTaskAsync<T>(request, CancellationToken.None);
227+
return this.ExecutePostTaskAsync<T>(request, CancellationToken.None);
228228
}
229229

230230
/// <summary>
@@ -241,7 +241,7 @@ public virtual Task<IRestResponse<T>> ExecutePostTaskAsync<T>(IRestRequest reque
241241
}
242242

243243
request.Method = Method.POST;
244-
return ExecuteTaskAsync<T>(request, token);
244+
return this.ExecuteTaskAsync<T>(request, token);
245245
}
246246

247247
/// <summary>
@@ -251,7 +251,7 @@ public virtual Task<IRestResponse<T>> ExecutePostTaskAsync<T>(IRestRequest reque
251251
/// <param name="request">Request to be executed</param>
252252
public virtual Task<IRestResponse<T>> ExecuteTaskAsync<T>(IRestRequest request)
253253
{
254-
return ExecuteTaskAsync<T>(request, CancellationToken.None);
254+
return this.ExecuteTaskAsync<T>(request, CancellationToken.None);
255255
}
256256

257257
/// <summary>
@@ -271,7 +271,7 @@ public virtual Task<IRestResponse<T>> ExecuteTaskAsync<T>(IRestRequest request,
271271

272272
try
273273
{
274-
var async = ExecuteAsync<T>(request, (response, _) =>
274+
var async = this.ExecuteAsync<T>(request, (response, _) =>
275275
{
276276
if (token.IsCancellationRequested)
277277
{
@@ -284,14 +284,14 @@ public virtual Task<IRestResponse<T>> ExecuteTaskAsync<T>(IRestRequest request,
284284
}
285285
});
286286

287-
token.Register(() =>
287+
var registration = token.Register(() =>
288288
{
289289
async.Abort();
290290
taskCompletionSource.TrySetCanceled();
291291
});
292292

293293
#if !WINDOWS_PHONE
294-
taskCompletionSource.Task.ContinueWith(t => t.Dispose(), token);
294+
taskCompletionSource.Task.ContinueWith(t => registration.Dispose(), token);
295295
#endif
296296
}
297297
catch (Exception ex)
@@ -308,7 +308,7 @@ public virtual Task<IRestResponse<T>> ExecuteTaskAsync<T>(IRestRequest request,
308308
/// <param name="request">Request to be executed</param>
309309
public virtual Task<IRestResponse> ExecuteTaskAsync(IRestRequest request)
310310
{
311-
return ExecuteTaskAsync(request, CancellationToken.None);
311+
return this.ExecuteTaskAsync(request, CancellationToken.None);
312312
}
313313

314314
/// <summary>
@@ -333,7 +333,7 @@ public virtual Task<IRestResponse> ExecuteGetTaskAsync(IRestRequest request, Can
333333
}
334334

335335
request.Method = Method.GET;
336-
return ExecuteTaskAsync(request, token);
336+
return this.ExecuteTaskAsync(request, token);
337337
}
338338

339339
/// <summary>
@@ -358,7 +358,7 @@ public virtual Task<IRestResponse> ExecutePostTaskAsync(IRestRequest request, Ca
358358
}
359359

360360
request.Method = Method.POST;
361-
return ExecuteTaskAsync(request, token);
361+
return this.ExecuteTaskAsync(request, token);
362362
}
363363

364364
/// <summary>
@@ -390,14 +390,14 @@ public virtual Task<IRestResponse> ExecuteTaskAsync(IRestRequest request, Cancel
390390
}
391391
});
392392

393-
token.Register(() =>
394-
{
395-
async.Abort();
396-
taskCompletionSource.TrySetCanceled();
397-
});
393+
var registration = token.Register(() =>
394+
{
395+
async.Abort();
396+
taskCompletionSource.TrySetCanceled();
397+
});
398398

399399
#if !WINDOWS_PHONE
400-
taskCompletionSource.Task.ContinueWith(t => t.Dispose(), token);
400+
taskCompletionSource.Task.ContinueWith(t => registration.Dispose(), token);
401401
#endif
402402
}
403403
catch (Exception ex)

0 commit comments

Comments
 (0)