Merge branch 'dev' of github.com-qoire:aionnetwork/aion into dev

aionnetwork · Apr 5, 2018 · 5fef797 · 5fef797
2 parents 48e70b8 + 9ca06f7
commit 5fef797
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
@@ -375,8 +375,13 @@ public synchronized List<AionTransaction> addPendingTransactions(List<AionTransa
                     Map<BigInteger,AionTransaction> cache = pendingTxCache.geCacheTx(tx.getFrom());
 
                     int limit = 0;
-                    if (!pendingTxCache.getCacheTxAccount().isEmpty()) {
-                        limit = pendingTxCache.getTxRtnLimit() / pendingTxCache.getCacheTxAccount().size();
+                    Set<Address> addr = pendingTxCache.getCacheTxAccount();
+                    if (!addr.isEmpty()) {
+                        limit = pendingTxCache.getTxRtnLimit() / addr.size();
+
+                        if (limit == 0) {
+                            limit = 1;
+                        }
                     }
 
                     if (LOG.isTraceEnabled()) {

diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java b/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java
@@ -215,8 +215,16 @@ public boolean isInCache(Address addr , BigInteger nonce) {
         return false;
     }
 
-    Set<Address> getCacheTxAccount() {
-        return new HashSet<>(this.cacheTxMap.keySet());
+    Set<Address> getCacheTxAccount()
+    {
+        Set<Address> acc = new HashSet<>();
+        for (Map.Entry<Address, TreeMap<BigInteger,AionTransaction>> e : this.cacheTxMap.entrySet()) {
+            if (!e.getValue().isEmpty()) {
+                acc.add(e.getKey());
+            }
+        }
+
+        return acc;
     }
 
     Map<BigInteger,AionTransaction> geCacheTx(Address from) {