Merge "Fix to use renewal keystone token when re-authenticated"

This commit is contained in:
Jenkins 2015-03-16 12:54:42 +00:00 committed by Gerrit Code Review
commit cc6e5951cc
1 changed files with 3 additions and 3 deletions

View File

@ -1804,10 +1804,10 @@ public final class SwiftRestClient {
* @param accessToken access token * @param accessToken access token
* @throws SwiftInternalStateException if the client is not yet authenticated * @throws SwiftInternalStateException if the client is not yet authenticated
*/ */
private void setAuthToken(HttpMethodBase method, AccessToken accessToken) private void setAuthToken(HttpMethod method, AccessToken accessToken)
throws SwiftInternalStateException { throws SwiftInternalStateException {
checkNotNull(accessToken,"Not authenticated"); checkNotNull(accessToken,"Not authenticated");
method.addRequestHeader(HEADER_AUTH_KEY, accessToken.getId()); method.setRequestHeader(HEADER_AUTH_KEY, accessToken.getId());
} }
/** /**
@ -1859,7 +1859,7 @@ public final class SwiftRestClient {
LOG.debug("Reauthenticating"); LOG.debug("Reauthenticating");
} }
//re-auth, this may recurse into the same dir //re-auth, this may recurse into the same dir
authenticate(); setAuthToken(method, authenticate());
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Retrying original request"); LOG.debug("Retrying original request");
} }