fix: Null pointer check for verification methods.

danubetech · Aug 22, 2022 · 87b66f3 · 87b66f3
1 parent 357c351
commit 87b66f3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/uniresolver/driver/did/dns/DidDnsDriver.java b/src/main/java/uniresolver/driver/did/dns/DidDnsDriver.java
@@ -139,12 +139,12 @@ public ResolveDataModelResult resolve(DID did, Map<String, Object> resolveOption
 			List<Object> capabilityDelegationVerificationMethods = JsonLDUtils.jsonLdGetJsonArray(didKeyDidDocument.getJsonObject(), DIDKeywords.JSONLD_TERM_CAPABILITYDELEGATION);
 			List<Object> keyAgreementVerificationMethods = JsonLDUtils.jsonLdGetJsonArray(didKeyDidDocument.getJsonObject(), DIDKeywords.JSONLD_TERM_KEYAGREEMENT);
 
-			allVerificationMethods.addAll(rewriteIdAndController(verificationMethods, target, did.toString(), keyId));
-			allAuthenticationVerificationMethods.addAll(rewriteIdAndController(authenticationVerificationMethods, target, did.toString(), keyId));
-			allAssertionMethodVerificationMethods.addAll(rewriteIdAndController(assertionMethodVerificationMethods, target, did.toString(), keyId));
-			allCapabilityInvocationVerificationMethods.addAll(rewriteIdAndController(capabilityInvocationVerificationMethods, target, did.toString(), keyId));
-			allCapabilityDelegationVerificationMethods.addAll(rewriteIdAndController(capabilityDelegationVerificationMethods, target, did.toString(), keyId));
-			allKeyAgreementVerificationMethods.addAll(rewriteIdAndController(keyAgreementVerificationMethods, target, did.toString(), keyId));
+			if (verificationMethods != null) allVerificationMethods.addAll(rewriteIdAndController(verificationMethods, target, did.toString(), keyId));
+			if (authenticationVerificationMethods != null) allAuthenticationVerificationMethods.addAll(rewriteIdAndController(authenticationVerificationMethods, target, did.toString(), keyId));
+			if (assertionMethodVerificationMethods != null) allAssertionMethodVerificationMethods.addAll(rewriteIdAndController(assertionMethodVerificationMethods, target, did.toString(), keyId));
+			if (capabilityInvocationVerificationMethods != null) allCapabilityInvocationVerificationMethods.addAll(rewriteIdAndController(capabilityInvocationVerificationMethods, target, did.toString(), keyId));
+			if (capabilityDelegationVerificationMethods != null) allCapabilityDelegationVerificationMethods.addAll(rewriteIdAndController(capabilityDelegationVerificationMethods, target, did.toString(), keyId));
+			if (keyAgreementVerificationMethods != null) allKeyAgreementVerificationMethods.addAll(rewriteIdAndController(keyAgreementVerificationMethods, target, did.toString(), keyId));
 			if (log.isDebugEnabled()) log.debug("All verification methods now: " + allVerificationMethods);
 		}