fix: avoid NPE in credential resolver

eclipse-edc · May 21, 2024 · d339104 · d339104
1 parent dda7f83
commit d339104
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...uery-lib/src/main/java/org/eclipse/edc/identityhub/query/CredentialQueryResolverImpl.java b/...uery-lib/src/main/java/org/eclipse/edc/identityhub/query/CredentialQueryResolverImpl.java
@@ -112,7 +112,8 @@ private boolean filterInvalidCredentials(VerifiableCredentialResource verifiable
             monitor.warning("Credential '%s' is expired.".formatted(credential.getId()));
             return false;
         }
-        var revocationResult = credential.getCredentialStatus().isEmpty() ? Result.success() : revocationService.checkValidity(credential);
+        var credentialStatus = credential.getCredentialStatus();
+        var revocationResult = (credentialStatus == null || credentialStatus.isEmpty()) ? Result.success() : revocationService.checkValidity(credential);
         if (revocationResult.failed()) {
             monitor.warning("Credential '%s' not valid: %s".formatted(credential.getId(), revocationResult.getFailureDetail()));
             return false;