Trivial: Fix possible NPE, typo

fix NPE fix typo and filter payouts to exclude other files
orogvany · Mar 29, 2018 · 3283b61 · 3283b61
1 parent 1430200
commit 3283b61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/semuxpool/pool/Pool.java b/src/main/java/com/semuxpool/pool/Pool.java
@@ -189,7 +189,7 @@ private boolean shouldPay(long currentBlock, boolean isSynced)
                 {
                     if (isSynced)
                     {
-                        logger.info("Time is pays " + payoutTime + ", time to pay!");
+                        logger.info("Time is " + payoutTime + ", time to pay!");
                     }
                     return isSynced;
                 }

diff --git a/src/main/java/com/semuxpool/pool/block/BlockResultFactory.java b/src/main/java/com/semuxpool/pool/block/BlockResultFactory.java
@@ -122,7 +122,10 @@ public BlockResult getBlockResult(Block block) throws IOException, SemuxExceptio
         Long poolPayout = 0l;
         for (String profitAddress : poolProfitsAddress.getAddresses())
         {
-            poolPayout += result.getPayouts().get(profitAddress);
+            if(result.getPayouts() != null && result.getPayouts().get(profitAddress) != null)
+            {
+                poolPayout += result.getPayouts().get(profitAddress);
+            }
         }
         logger.trace("Pool profits: " + poolPayout);
         float totalPercent = 0;

diff --git a/src/main/java/com/semuxpool/pool/persistence/JsonPersistence.java b/src/main/java/com/semuxpool/pool/persistence/JsonPersistence.java
@@ -123,7 +123,11 @@ public List<Payout> getAllPayouts() throws IOException
         List<Payout> payouts = new ArrayList<>();
         for (String fileName : payoutFileNames)
         {
-            logger.debug("Checking file " + fileName);
+            if(!fileName.endsWith(".json"))
+            {
+                continue;
+            }
+            logger.info("Checking file " + fileName);
             //look for last one not paid out
             File file = new File(fileName);
             Payout payout = mapper.readValue(file, Payout.class);