From 7e9b1d5e1627bbfc301aa2ba8f75e5995cd24bac Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 19 Jun 2021 20:25:25 +0100 Subject: [PATCH] Rework of DataFile.base58Digest() This fixes an NPE when trying to send a file that doesn't exist. It also removes the caching, which we can add again later if it turns out to be needed. --- src/main/java/org/qortal/storage/DataFile.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/storage/DataFile.java b/src/main/java/org/qortal/storage/DataFile.java index 37f5a2ea..9e446966 100644 --- a/src/main/java/org/qortal/storage/DataFile.java +++ b/src/main/java/org/qortal/storage/DataFile.java @@ -49,7 +49,6 @@ public class DataFile { protected String filePath; private ArrayList chunks; - protected String base58Digest; public DataFile() { } @@ -315,10 +314,10 @@ public class DataFile { } public String base58Digest() { - if (this.base58Digest == null) { - this.base58Digest = Base58.encode(this.digest()); + if (this.digest() != null) { + return Base58.encode(this.digest()); } - return this.base58Digest; + return null; } public String shortDigest() {