Repository: cxf-fediz Updated Branches: refs/heads/1.3.x-fixes ed1f97c90 -> 08d9d41bf
Fixing NPE when restarting Fediz OIDC after using dynamic registration, patch from Adrian Gonzalez applied, This closes #13 Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/08d9d41b Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/08d9d41b Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/08d9d41b Branch: refs/heads/1.3.x-fixes Commit: 08d9d41bf9c5c02408c4afc480eb47aaef0bb960 Parents: ed1f97c Author: Sergey Beryozkin <[email protected]> Authored: Fri Mar 10 13:22:42 2017 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Mar 10 14:36:20 2017 +0000 ---------------------------------------------------------------------- .../oidc/clients/ClientRegistrationService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/08d9d41b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java index cbebdb4..db65cb5 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java @@ -402,14 +402,16 @@ public class ClientRegistrationService { public void init() { for (Client c : clientProvider.getClients(null)) { - String userName = c.getResourceOwnerSubject().getLogin(); - getClientRegistrations(userName).add(c); - Set<String> names = clientNames.get(userName); - if (names == null) { - names = new HashSet<String>(); - clientNames.put(userName, names); + if (c.getResourceOwnerSubject() != null) { + String userName = c.getResourceOwnerSubject().getLogin(); + getClientRegistrations(userName).add(c); + Set<String> names = clientNames.get(userName); + if (names == null) { + names = new HashSet<String>(); + clientNames.put(userName, names); + } + names.add(c.getApplicationName()); } - names.add(c.getApplicationName()); } }
