openstack
/
sahara-extra
Code Issues Proposed changes

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
parent 4e8e7e5cd9 13015323df
commit cc6e5951cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-swiftfs/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
View File

@ -1804,10 +1804,10 @@ public final class SwiftRestClient {
* @param accessToken access token
* @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 {
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");
}
//re-auth, this may recurse into the same dir
authenticate();
setAuthToken(method, authenticate());
if (LOG.isDebugEnabled()) {
LOG.debug("Retrying original request");
}