Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 553b11172 -> 29c538e8d
Minor update to oAuth2 utils Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29c538e8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29c538e8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29c538e8 Branch: refs/heads/3.0.x-fixes Commit: 29c538e8dc58c857d5d560dfa9bf825287fc3ee2 Parents: 553b111 Author: Sergey Beryozkin <[email protected]> Authored: Wed Oct 28 16:37:13 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Oct 28 16:38:35 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/29c538e8/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java index 9995251..57ab9e9 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java @@ -131,7 +131,7 @@ public final class OAuthUtils { public static boolean isGrantSupportedForClient(Client client, boolean canSupportPublicClients, String grantType) { - if (!client.isConfidential() && !canSupportPublicClients) { + if (grantType == null || !client.isConfidential() && !canSupportPublicClients) { return false; } List<String> allowedGrants = client.getAllowedGrantTypes();
