Merge pull request #1502 from tronprotocol/develop

master

Author: zhaohong

src/main/java/org/tron/core/db/PendingManager.java

@@ -27,7 +27,8 @@ public void close() {
 
     for (TransactionCapsule tx : this.tmpTransactions) {
       try {
-        if (tx.getTrxTrace().getTimeResultType().equals(TimeResultType.NORMAL)) {
+        if (tx.getTrxTrace() != null &&
+            tx.getTrxTrace().getTimeResultType().equals(TimeResultType.NORMAL)) {
           dbManager.getRepushTransactions().put(tx);
         }
       } catch (InterruptedException e) {
@@ -39,9 +40,7 @@ public void close() {
 
     for (TransactionCapsule tx : dbManager.getPoppedTransactions()) {
       try {
-        if (tx.getTrxTrace().getTimeResultType().equals(TimeResultType.NORMAL)) {
           dbManager.getRepushTransactions().put(tx);
-        }
       } catch (InterruptedException e) {
         logger.error(e.getMessage());
         Thread.currentThread().interrupt();