Do not add User-agent again when retrying

Fix for http://code.google.com/p/google-http-java-client/issues/detail?id=119 : User-agent repeatedly added on retry.

[nherring, 2012-05-22 14:18:28]

Looks good from here.

[yanivi, 2012-05-22 20:36:00]

http://codereview.appspot.com/6215076/diff/2001/google-http-client/src/main/j...
File
google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
(right):

http://codereview.appspot.com/6215076/diff/2001/google-http-client/src/main/j...
google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java:787:
} else if (retriesRemaining == numRetries) {
This will fail to work correctly if the interceptor messes around with the
User-Agent header.  What I recommend we do instead that would be more robust is
something like:

      // add to user agent
      String originalUserAgent = headers.getUserAgent();
      if (originalUserAgent == null) {
        headers.setUserAgent(USER_AGENT_SUFFIX);
      } else {
        // Only add user agent if this request is not a retry.
        headers.setUserAgent(originalUserAgent + " " + USER_AGENT_SUFFIX);
      }
      // headers
      HttpHeaders.serializeHeaders(headers, logbuf, logger,
lowLevelHttpRequest);
      headers.setUserAgent(originalUserAgent);

[rmistry, 2012-05-23 11:29:23]

http://codereview.appspot.com/6215076/diff/2001/google-http-client/src/main/j...
File
google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
(right):

http://codereview.appspot.com/6215076/diff/2001/google-http-client/src/main/j...
google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java:787:
} else if (retriesRemaining == numRetries) {
On 2012/05/22 20:36:00, yanivi wrote:
> This will fail to work correctly if the interceptor messes around with the
> User-Agent header.  What I recommend we do instead that would be more robust
is
> something like:
> 
>       // add to user agent
>       String originalUserAgent = headers.getUserAgent();
>       if (originalUserAgent == null) {
>         headers.setUserAgent(USER_AGENT_SUFFIX);
>       } else {
>         // Only add user agent if this request is not a retry.
>         headers.setUserAgent(originalUserAgent + " " + USER_AGENT_SUFFIX);
>       }
>       // headers
>       HttpHeaders.serializeHeaders(headers, logbuf, logger,
> lowLevelHttpRequest);
>       headers.setUserAgent(originalUserAgent);

Done.

[yanivi, 2012-05-23 12:49:11]

LGTM