Updated Branches: refs/heads/1.6.x 35a44243a -> 7b0cd9be4
A 401 error should result in re-authenticating for a new token Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/7b0cd9be Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/7b0cd9be Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/7b0cd9be Branch: refs/heads/1.6.x Commit: 7b0cd9be43a6035a71652bb5c9f3cd604e18eb9d Parents: 35a4424 Author: Zack Shoylev <[email protected]> Authored: Tue Jul 9 14:04:08 2013 -0500 Committer: Andrew Gaul <[email protected]> Committed: Tue Jul 9 14:15:16 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/7b0cd9be/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 d358484..835e65e 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); - //TODO: what is the error when the session token expires?? - if (content != null && new String(content).contains("lease renew")) { + // Error when the session token expires: HTTP/1.1 401 Unauthorized, no body (or provider-specific response body) + if (content != null) { logger.debug("invalidating authentication token"); authenticationResponseCache.invalidateAll(); retry = true; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7b0cd9be/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 f152701..87beb37 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("token expired, please renew")).anyTimes(); + expect(response.getPayload()).andReturn(Payloads.newStringPayload("")).anyTimes(); expect(response.getStatusCode()).andReturn(401).atLeastOnce(); replay(command);
