Updated Branches: refs/heads/1.6.x 78e5832fd -> faecd45a0
Revert "A 401 error should result in re-authenticating for a new token" This reverts commit 7b0cd9be43a6035a71652bb5c9f3cd604e18eb9d. References JCLOUDS-231 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/c0a438b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/c0a438b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/c0a438b6 Branch: refs/heads/1.6.x Commit: c0a438b6718b5ec8a827e1cad2f13a5c0f4d7345 Parents: 78e5832 Author: Andrew Gaul <[email protected]> Authored: Mon Aug 5 21:37:51 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Aug 5 21:37:51 2013 -0700 ---------------------------------------------------------------------- .../jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java | 4 ++-- .../openstack/keystone/v2_0/handlers/RetryOnRenewTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c0a438b6/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java index 835e65e..d358484 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenew.java @@ -64,8 +64,8 @@ public class RetryOnRenew implements HttpRetryHandler { retry = false; } else { byte[] content = closeClientButKeepContentStream(response); - // Error when the session token expires: HTTP/1.1 401 Unauthorized, no body (or provider-specific response body) - if (content != null) { + //TODO: what is the error when the session token expires?? + if (content != null && new String(content).contains("lease renew")) { logger.debug("invalidating authentication token"); authenticationResponseCache.invalidateAll(); retry = true; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c0a438b6/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenewTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenewTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenewTest.java index 87beb37..f152701 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenewTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/handlers/RetryOnRenewTest.java @@ -53,7 +53,7 @@ public class RetryOnRenewTest { cache.invalidateAll(); expectLastCall(); - expect(response.getPayload()).andReturn(Payloads.newStringPayload("")).anyTimes(); + expect(response.getPayload()).andReturn(Payloads.newStringPayload("token expired, please renew")).anyTimes(); expect(response.getStatusCode()).andReturn(401).atLeastOnce(); replay(command);
