Make getHeaders() nonull

ethereum · Nov 8, 2018 · 1166301 · 1166301
1 parent 392f29c
commit 1166301
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/sync/BlockDownloader.java b/ethereumj-core/src/main/java/org/ethereum/sync/BlockDownloader.java
@@ -393,7 +393,7 @@ private boolean validateAndAddHeaders(List<BlockHeader> headers, byte[] nodeId)
         SyncQueueIfc.ValidatedHeaders res;
         synchronized (this) {
             res = syncQueue.addHeadersAndValidate(wrappers);
-            if (res.isValid() && res.getHeaders() != null && !res.getHeaders().isEmpty()) {
+            if (res.isValid() && !res.getHeaders().isEmpty()) {
                 pushHeaders(res.getHeaders());
             }
         }

diff --git a/ethereumj-core/src/main/java/org/ethereum/sync/SyncQueueIfc.java b/ethereumj-core/src/main/java/org/ethereum/sync/SyncQueueIfc.java
@@ -21,6 +21,7 @@
 import org.ethereum.core.BlockHeader;
 import org.ethereum.core.BlockHeaderWrapper;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Collections;
@@ -67,7 +68,7 @@ interface BlocksRequest {
      *     Otherwise, the list contains invalid headers.
      */
     class ValidatedHeaders {
-        public static final ValidatedHeaders Empty = new ValidatedHeaders(null, true);
+        public static final ValidatedHeaders Empty = new ValidatedHeaders(Collections.emptyList(), true);
 
         private final List<BlockHeaderWrapper> headers;
         private final boolean valid;
@@ -87,6 +88,7 @@ public boolean isValid() {
             return valid;
         }
 
+        @Nonnull
         public List<BlockHeaderWrapper> getHeaders() {
             return headers;
         }
@@ -97,13 +99,13 @@ public String getReason() {
 
         @Nullable
         public byte[] getNodeId() {
-            if (headers == null || headers.isEmpty()) return null;
+            if (headers.isEmpty()) return null;
             return headers.get(0).getNodeId();
         }
 
         @Nullable
         public BlockHeader getHeader() {
-            if (headers == null || headers.isEmpty()) return null;
+            if (headers.isEmpty()) return null;
             return headers.get(0).getHeader();
         }
     }