fix possible NPE

everytrade-io · Oct 9, 2020 · 5b52404 · 5b52404
1 parent bf3f9c4
commit 5b52404
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/plugin-base/src/main/java/io/everytrade/server/plugin/impl/everytrade/EveryTradeApiDto.java b/plugin-base/src/main/java/io/everytrade/server/plugin/impl/everytrade/EveryTradeApiDto.java
@@ -2,11 +2,12 @@
 
 import io.everytrade.server.parser.exchange.EveryTradeApiTransactionBean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EveryTradeApiDto {
     private String[] header; //TODO: remove header?
-    private List<EveryTradeApiTransactionBean> transactions;
+    private List<EveryTradeApiTransactionBean> transactions = new ArrayList<>();
 
     public EveryTradeApiDto() {
     }

diff --git a/...n-base/src/main/java/io/everytrade/server/plugin/impl/everytrade/EveryTradeConnector.java b/...n-base/src/main/java/io/everytrade/server/plugin/impl/everytrade/EveryTradeConnector.java
@@ -96,7 +96,8 @@ public DownloadResult getTransactions(String lastTransactionId) {
         final EveryTradeApiDto data =
             api.getTransactions(apiKey, signer, lastTransactionId, MAX_FETCH_SIZE);
 
-        final List<EveryTradeApiTransactionBean> transactions = data.getTransactions();
+        final List<EveryTradeApiTransactionBean> transactions
+            = Objects.requireNonNullElse(data.getTransactions(), new ArrayList<>());
 
         final List<ImportedTransactionBean> importedTransactions = new ArrayList<>();
         final List<RowError> errorRows = new ArrayList<>();