From c1bd65e8c65f47b423dcfa2d739fe140e6152d0f Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 29 Apr 2025 10:46:45 +0200 Subject: [PATCH] 127655: avoid nullpointer --- src/app/core/submission/submission-rest.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts index c64d04d1c2..d83a07387a 100644 --- a/src/app/core/submission/submission-rest.service.ts +++ b/src/app/core/submission/submission-rest.service.ts @@ -4,7 +4,7 @@ import { Observable, skipWhile } from 'rxjs'; import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators'; import { RequestService } from '../data/request.service'; -import { hasValue, isNotEmpty } from '../../shared/empty.util'; +import { hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util'; import { DeleteRequest, PostRequest, @@ -128,7 +128,8 @@ export class SubmissionRestService { this.sendGetDataRequest(endpointURL, useCachedVersionIfAvailable); const startTime: number = new Date().getTime(); return this.requestService.getByHref(endpointURL).pipe( - map((requestEntry) => requestEntry.request.uuid), + map((requestEntry) => requestEntry?.request?.uuid), + hasValueOperator(), distinctUntilChanged(), switchMap((requestId) => this.rdbService.buildFromRequestUUID(requestId)), // This skip ensures that if a stale object is present in the cache when you do a