Issue 464: Error when setting an invalid etag

Src/GoogleApis/Apis/Requests/ClientServiceRequest.cs

 /*
 Copyright 2011 Google Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
@@ skipping 167 matching lines @@
 
 #endregion
 
 public HttpRequestMessage CreateRequest(Nullable<bool> overrideGZipEnabl
ed = null)
 {
 var builder = CreateBuilder();
 var request = builder.CreateRequest();
 object body = GetBody();
 request.SetRequestSerailizedContent(service, body, overrideGZipEnabl
ed.HasValue
 ? overrideGZipEnabled.Value : service.GZipEnabled);
-
 AddETag(request);
 return request;
 }
 
 /// <summary>
- /// Creates the <seealso cref="Google.Apis.Requests.RequestBuilder"/> wh
 ich is used to generate a request.
+ /// Creates the <see cref="Google.Apis.Requests.RequestBuilder"/> which 
 is used to generate a request.
 /// </summary>
 /// <returns>
 /// A new builder instance which contains the HTTP method and the right
Uri with its path and query parameters.
 /// </returns>
 private RequestBuilder CreateBuilder()
 {
 var builder = new RequestBuilder()
 {
 BaseUri = new Uri(Service.BaseUri),
 Path = RestPath,
@@ skipping 22 matching lines @@
 
 /// <summary>
 /// Adds the right ETag action (e.g. If-Match) header to the given HTTP
request if the body contains ETag.
 /// </summary>
 private void AddETag(HttpRequestMessage request)
 {
 IDirectResponseSchema body = GetBody() as IDirectResponseSchema;
 if (body != null && !string.IsNullOrEmpty(body.ETag))
 {
 var etag = body.ETag;
- // Fix etag if it's invalid.
+ ETagAction action = ETagAction == ETagAction.Default ? GetDefaul
 tETagAction(HttpMethod) : ETagAction;
+ try
+ {
+ switch (action)
+ {
+ case ETagAction.IfMatch:
+ request.Headers.IfMatch.Add(new EntityTagHeaderValue
 (etag));
+ break;
+ case ETagAction.IfNoneMatch:
+ request.Headers.IfNoneMatch.Add(new EntityTagHeaderV
 alue(etag));
+ break;
+ }
+ }
+ // When ETag is invalid we are going to create a request anyway.
 // See https://code.google.com/p/google-api-dotnet-client/issues
/detail?id=464 for more details.
- if (!etag.StartsWith("\""))
- etag = "\"" etag;
- if (!etag.EndsWith("\""))
- etag = etag "\"";
-
- ETagAction action = ETagAction == ETagAction.Default ? GetDefaul
 tETagAction(HttpMethod) : ETagAction;
- switch (action)
- {
- case ETagAction.IfMatch:
- request.Headers.IfMatch.Add(new EntityTagHeaderValue(eta
 g));
- break;
- case ETagAction.IfNoneMatch:
- request.Headers.IfNoneMatch.Add(new EntityTagHeaderValue
 (etag));
- break;
+ catch (FormatException ex)
+ {
+ Logger.Error(ex, "Can't set {0}. Etag is: {1}.", action, eta
 g);
 }
 }
 }
 
 /// <summary>Returns the default ETagAction for a specific HTTP verb.</s
ummary>
 [VisibleForTestOnly]
 internal static ETagAction GetDefaultETagAction(string httpMethod)
 {
 switch (httpMethod)
 {
@@ skipping 68 matching lines @@
 {
 throw new GoogleApiException(service.Name,
 string.Format("Parameter \"{0}\" is missing", parameter.
Name));
 }
 }
 }
 
 #endregion
 }
 }