handle canceled WebRequest error and properly dispose of streams

cdsboy · Jan 5, 2012 · 3ed37dd · 3ed37dd
1 parent 78da7af
commit 3ed37dd
Showing 1 changed file with 28 additions and 9 deletions.
diff --git a/src/csharp/Plupload/FileReference.cs b/src/csharp/Plupload/FileReference.cs
@@ -261,6 +261,16 @@ public class FileReference {
 		    if (!this.stopped) {
 		        this.stopped = true;
 		        req.Abort();
+
+                if (fileStream != null) {
+                    fileStream.Dispose();
+                    fileStream = null;
+                }
+
+                if (imageStream != null) {
+                    imageStream.Dispose();
+                    imageStream = null;
+                }
 		    }
 		}
 
@@ -414,17 +424,26 @@ public class FileReference {
 		}
 
 		private void ResponseCallback(IAsyncResult ar) {
-			try {
-				HttpWebRequest request = ar.AsyncState as HttpWebRequest;
+            try
+            {
+                HttpWebRequest request = ar.AsyncState as HttpWebRequest;
 
-				WebResponse response = request.EndGetResponse(ar);
+                WebResponse response = request.EndGetResponse(ar);
 
-				syncContext.Post(ExtractResponse, response);
-			} catch (Exception ex) {
-				syncContext.Send(delegate {
-					this.OnIOError(new ErrorEventArgs(ex.Message, this.chunk, this.chunks));
-				}, this);
-			}
+                syncContext.Post(ExtractResponse, response);
+            }
+            catch (WebException ex) {
+                if (ex.Status != WebExceptionStatus.RequestCanceled) {
+                    syncContext.Send(delegate {
+                        this.OnIOError(new ErrorEventArgs(ex.Message, this.chunk, this.chunks));
+                    }, this);
+                }
+            }
+            catch (Exception ex) {
+                syncContext.Send(delegate {
+                    this.OnIOError(new ErrorEventArgs(ex.Message, this.chunk, this.chunks));
+                }, this);
+            }
 		}
 
 		private void ExtractResponse(object state) {