You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/01/14 11:41:42 UTC
cxf git commit: Minor update to the way OAuth2 client is deleted
Repository: cxf
Updated Branches:
refs/heads/master bf4f4c89b -> 988fcce01
Minor update to the way OAuth2 client is deleted
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/988fcce0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/988fcce0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/988fcce0
Branch: refs/heads/master
Commit: 988fcce01796a42b926a39a43522711da504e922
Parents: bf4f4c8
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Jan 14 10:41:27 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Jan 14 10:41:27 2016 +0000
----------------------------------------------------------------------
.../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java | 5 ++---
.../oauth2/provider/DefaultEHCacheOAuthDataProvider.java | 6 +++++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/988fcce0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 2b0e651..9c0216c 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -57,10 +57,9 @@ public class DefaultEHCacheCodeDataProvider extends DefaultEHCacheOAuthDataProvi
}
@Override
- public Client removeClient(String clientId) {
- Client c = super.removeClient(clientId);
+ protected Client doRemoveClient(Client c) {
removeClientCodeGrants(c);
- return c;
+ return super.doRemoveClient(c);
}
protected void removeClientCodeGrants(Client c) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/988fcce0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index 176bd7e..1f6ac00 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -83,8 +83,12 @@ public class DefaultEHCacheOAuthDataProvider extends AbstractOAuthDataProvider {
@Override
public Client removeClient(String clientId) {
Client c = getClient(clientId);
- clientCache.remove(clientId);
+ return doRemoveClient(c);
+ }
+
+ protected Client doRemoveClient(Client c) {
removeClientTokens(c);
+ clientCache.remove(c.getClientId());
return c;
}