Fix nullpointer

bisq-network · Sep 27, 2018 · dbe0993 · dbe0993
1 parent 8eabd66
commit dbe0993
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core/src/main/java/bisq/core/dao/state/blockchain/BaseBlock.java b/core/src/main/java/bisq/core/dao/state/blockchain/BaseBlock.java
@@ -19,8 +19,11 @@
 
 import io.bisq.generated.protobuffer.PB;
 
+import java.util.Optional;
+
 import lombok.Data;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -33,6 +36,7 @@ public abstract class BaseBlock {
     protected final int height;
     protected final long time; // in ms
     protected final String hash;
+    @Nullable // in case of first block in the blockchain
     protected final String previousBlockHash;
 
     BaseBlock(int height, long time, String hash, String previousBlockHash) {
@@ -48,11 +52,13 @@ public abstract class BaseBlock {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     PB.BaseBlock.Builder getBaseBlockBuilder() {
-        return PB.BaseBlock.newBuilder()
+        PB.BaseBlock.Builder builder = PB.BaseBlock.newBuilder()
                 .setHeight(height)
                 .setTime(time)
-                .setHash(hash)
-                .setPreviousBlockHash(previousBlockHash);
+                .setHash(hash);
+        Optional.ofNullable(previousBlockHash).ifPresent(builder::setPreviousBlockHash);
+        return builder;
+
     }
 
     @Override