/trunk/Pithos.Network/RestClient.cs - Diff - Pithos MS Client - Greek Research and Technology Network's projects

Revision 692ec33b trunk/Pithos.Network/RestClient.cs

+            }
             private WebHeaderCollection _responseHeaders;
             public new WebHeaderCollection ResponseHeaders
+            {
                 get
+                {
                     if (base.ResponseHeaders==null)
+                    {
                         return _responseHeaders;
+                    }
                     else
+                    {
                         _responseHeaders = null;
                         return base.ResponseHeaders;
+                    }
+                }
                 set { _responseHeaders = value; }
+            }
             protected override WebRequest GetWebRequest(Uri address)
+            {
                 TimedOut = false;
-...
                 //Does the response have any content to log?
                 if (exc.Response.ContentLength > 0)
+                {
                     var content = GetContent(exc.Response);
                     var content = LogContent(exc.Response);
                     Log.ErrorFormat(content);
+                }
                 return false;
-...
             public DateTime LastModified { get; private set; }
             private static string GetContent(WebResponse webResponse)
             private static string LogContent(WebResponse webResponse)
+            {
                 if (webResponse == null)
                     throw new ArgumentNullException("webResponse");
                 Contract.EndContractBlock();
                 string content;
                 using (var stream = webResponse.GetResponseStream())
                 using (var reader = new StreamReader(stream))
                 //The response stream must be copied to avoid affecting other code by disposing of the
                 //original response stream.
                 var stream = webResponse.GetResponseStream();
                 using(var memStream=new MemoryStream((int) stream.Length))
                 using (var reader = new StreamReader(memStream))
+                {
                     content = reader.ReadToEnd();
                     stream.CopyTo(memStream);
                     string content = reader.ReadToEnd();
                     stream.Seek(0,SeekOrigin.Begin);
                     return content;
+                }
                 return content;
+            }
             public string DownloadStringWithRetry(string address,int retries=0)
-...
                 var actualRetries = (retries == 0) ? Retries : retries;
                 var uriString = String.Join("/", BaseAddress.TrimEnd('/'), actualAddress);
                 var task = Retry(() =>
+                {
                     var uriString = String.Join("/", BaseAddress.TrimEnd('/'), actualAddress);
+                {
                     var content = base.DownloadString(uriString);
                     if (StatusCode == HttpStatusCode.NoContent)
-...
                     if (method == "PUT")
                         request.ContentLength = 0;
                     //Have to use try/finally instead of using here, because WebClient needs a valid WebResponse object
                     //in order to return response headers
                     var response = (HttpWebResponse)GetWebResponse(request);
                     //var response = (HttpWebResponse)request.GetResponse();
                     try
+                    {
                         LastModified = response.LastModified;
                         StatusCode = response.StatusCode;
                         StatusDescription = response.StatusDescription;
+                    }
                     finally
+                    {
                         response.Close();
+                    }
                     //ResponseHeaders= response.Headers;
                     LastModified = response.LastModified;
                     StatusCode = response.StatusCode;
                     StatusDescription = response.StatusDescription;
                     response.Close();
                     return 0;
                 }, actualRetries);

Also available in: Unified diff

Synnefo » Pithos MS Client

Revision 692ec33b trunk/Pithos.Network/RestClient.cs