From 265624b285690976240ffd1114076f555f1343da Mon Sep 17 00:00:00 2001 From: kangelov Date: Tue, 8 Apr 2014 08:19:43 -0400 Subject: [PATCH] a fix for a NullPointerException whenever a client requests a client scope to be granted. --- .../org/mitre/openid/connect/token/TofuUserApprovalHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java index dfbdb30f7..9b87dfca7 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java @@ -208,7 +208,7 @@ public class TofuUserApprovalHandler implements UserApprovalHandler { // If it's structured, assign the user-specified parameter SystemScope systemScope = systemScopes.getByValue(scope); - if (systemScope.isStructured()){ + if (systemScope != null && systemScope.isStructured()){ String paramValue = approvalParams.get("scopeparam_" + scope); allowedScopes.add(scope + ":"+paramValue); // .. and if it's unstructured, we're all set