Merge pull request #2313 from atlanhq/PLT-1831-aioob

PLT-1831 ArrayIndexOutOfBoundsException
atlanhq · Aug 25, 2023 · 002ab9b · 002ab9b
2 parents 5da6cd5 + 1c6b597
commit 002ab9b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/auth-agents-common/src/main/java/org/apache/atlas/plugin/util/KeycloakUserStore.java b/auth-agents-common/src/main/java/org/apache/atlas/plugin/util/KeycloakUserStore.java
@@ -92,14 +92,15 @@ public boolean isKeycloakSubjectsStoreUpdated(long cacheLastUpdatedTime) throws
                 List<AdminEventRepresentation> adminEvents = getKeycloakClient().getAdminEvents(OPERATION_TYPES,
                         null, null, null, null, null, null, null,
                         from, size);
-                Optional<AdminEventRepresentation> event = adminEvents.stream().filter(x -> RESOURCE_TYPES.contains(x.getResourceType())).findFirst();
 
-                if (event.isPresent()) {
-                    latestKeycloakEventTime = event.get().getTime();
+                if (CollectionUtils.isEmpty(adminEvents) || cacheLastUpdatedTime > adminEvents.get(adminEvents.size() - 1).getTime()) {
                     break;
                 }
 
-                if (cacheLastUpdatedTime > adminEvents.get(adminEvents.size() - 1).getTime()) {
+                Optional<AdminEventRepresentation> event = adminEvents.stream().filter(x -> RESOURCE_TYPES.contains(x.getResourceType())).findFirst();
+
+                if (event.isPresent()) {
+                    latestKeycloakEventTime = event.get().getTime();
                     break;
                 }
             }
@@ -114,16 +115,16 @@ public boolean isKeycloakSubjectsStoreUpdated(long cacheLastUpdatedTime) throws
                 List<EventRepresentation> events = getKeycloakClient().getEvents(EVENT_TYPES,
                         null, null, null, null, null, from, size);
 
+                if (CollectionUtils.isEmpty(events) || cacheLastUpdatedTime > events.get(events.size() - 1).getTime()) {
+                    break;
+                }
+
                 Optional<EventRepresentation> event = events.stream().filter(this::isUpdateProfileEvent).findFirst();
 
                 if (event.isPresent()) {
                     latestKeycloakEventTime = event.get().getTime();
                     break;
                 }
-
-                if (cacheLastUpdatedTime > events.get(events.size() - 1).getTime()) {
-                    break;
-                }
             }
 
             if (latestKeycloakEventTime > cacheLastUpdatedTime) {