You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/07/09 23:14:59 UTC
git commit: A 401 error should result in re-authenticating for a new
token
Updated Branches:
refs/heads/master 60e906289 -> 833f046a5
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/833f046a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/833f046a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/833f046a
Branch: refs/heads/master
Commit: 833f046a5ce54b1fc1ea1674d3baf743143fb517
Parents: 60e9062
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Jul 9 14:04:08 2013 -0500
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jul 9 14:14:37 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/833f046a/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/833f046a/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);