From 742620a29ce386b412316ec1501a6d216562e644 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Sat, 3 Aug 2019 15:04:23 +0200
Subject: [PATCH] DefaultSystemScopeService: Fix new logic

---
 .../oauth2/service/impl/DefaultSystemScopeService.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
index 61022a73c..d5182de93 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
@@ -22,6 +22,7 @@ package org.mitre.oauth2.service.impl;
 
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -136,15 +137,15 @@ public class DefaultSystemScopeService implements SystemScopeService {
 		if (scope == null) {
 			return null;
 		} else {
-			Set<String> scopeValues = scope.stream().filter(s -> s != null).collect(Collectors.toSet());
+			Set<String> scopeValues = scope.stream().filter(Objects::nonNull).collect(Collectors.toSet());
 			Set<SystemScope> scopesFromDB = getByValues(scopeValues);
 			Set<String> scopesFromDBValues = scopesFromDB.stream().map(SystemScope::getValue).collect(Collectors.toSet());
-			Set<SystemScope> missingScopesFromDB = scopesFromDB
+			Set<SystemScope> missingScopesFromDB = scopeValues
 					.stream()
-					.map(SystemScope::getValue)
 					.filter(sv -> !scopesFromDBValues.contains(sv))
 					.map(sv -> new SystemScope(sv))
 					.collect(Collectors.toSet());
+
 			Set<SystemScope> allScopes = new HashSet<SystemScope>();
 			allScopes.addAll(scopesFromDB);
 			allScopes.addAll(missingScopesFromDB);