fix: NPE fix

FgForrest · Feb 7, 2025 · 5e0b708 · 5e0b708
1 parent 70b4973
commit 5e0b708
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/...tore/evita_store_server/src/main/java/io/evitadb/store/traffic/TrafficRecordingIndex.java b/...tore/evita_store_server/src/main/java/io/evitadb/store/traffic/TrafficRecordingIndex.java
@@ -669,15 +669,17 @@ private void emptyRemovalQueue() {
 	 */
 	private void removeSessionFromIndexes(long sessionSequenceOrder) {
 		final SessionDescriptor sessionDescriptor = this.sessionUuidIndex.remove(sessionSequenceOrder);
-		this.sessionIdIndex.remove(sessionDescriptor.getSessionId());
-		this.sessionCreationIndex.delete(sessionDescriptor.getCreated());
-		this.sessionDurationIndex.delete(sessionDescriptor.getMaxDurationInMillis());
-		this.sessionFetchCountIndex.delete(sessionDescriptor.getMaxFetchCount());
-		this.sessionBytesFetchedIndex.delete(sessionDescriptor.getMaxBytesFetchedTotal());
-		for (TrafficRecordingType recordingType : sessionDescriptor.getRecordingTypes()) {
-			final TransactionalObjectBPlusTree<Long, Long> typeIndex = this.sessionRecordingTypeIndex.get(recordingType);
-			if (typeIndex != null) {
-				typeIndex.delete(sessionSequenceOrder);
+		if (sessionDescriptor != null) {
+			this.sessionIdIndex.remove(sessionDescriptor.getSessionId());
+			this.sessionCreationIndex.delete(sessionDescriptor.getCreated());
+			this.sessionDurationIndex.delete(sessionDescriptor.getMaxDurationInMillis());
+			this.sessionFetchCountIndex.delete(sessionDescriptor.getMaxFetchCount());
+			this.sessionBytesFetchedIndex.delete(sessionDescriptor.getMaxBytesFetchedTotal());
+			for (TrafficRecordingType recordingType : sessionDescriptor.getRecordingTypes()) {
+				final TransactionalObjectBPlusTree<Long, Long> typeIndex = this.sessionRecordingTypeIndex.get(recordingType);
+				if (typeIndex != null) {
+					typeIndex.delete(sessionSequenceOrder);
+				}
 			}
 		}
 	}