mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[KEYCLOAK-6321] - NPE when deleting a resource with admin events enabled

Browse Source
This commit is contained in:
pedroigor authored and Marek Posolda committed 2018-02-21 19:41:44 +01:00
1 parent 12a2f23101
commit d590600c12
1 file changed
+30 -6
Download Patch File Download Diff File Expand all files Collapse all files
model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java
+30 -6
View File
@@ -99,7 +99,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;
@@ -118,7 +122,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;
@@ -135,7 +143,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;
@@ -177,7 +189,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;
@@ -196,7 +212,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;
@@ -231,7 +251,11 @@ public class JPAResourceStore implements ResourceStore {
ResourceStore resourceStore = provider.getStoreFactory().getResourceStore();
for (String id : result) {
list.add(resourceStore.findById(id, resourceServerId));
Resource resource = resourceStore.findById(id, resourceServerId);
if (resource != null) {
list.add(resource);
}
}
return list;