add missing EventBloomException for switchFork; throw exception before addAll matchedLog instead after

Author: 317787106

framework/src/main/java/org/tron/core/db/Manager.java

@@ -1155,7 +1155,8 @@ private void switchFork(BlockCapsule newHead)
             | ValidateScheduleException
             | VMIllegalException
             | ZksnarkException
-            | BadBlockException e) {
+            | BadBlockException
+            | EventBloomException e) {
           logger.warn(e.getMessage(), e);
           exception = e;
           throw e;

framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java

@@ -93,14 +93,14 @@ public LogFilterElement[] matchBlockOneByOne()
       String blockHash = manager.getChainBaseManager().getBlockIdByNum(blockNum).toString();
       List<LogFilterElement> matchedLog = matchBlock(logFilterWrapper.getLogFilter(), blockNum,
           blockHash, transactionInfoList, false);
+
       if (!matchedLog.isEmpty()) {
+        if (logFilterElementList.size() + matchedLog.size() > LogBlockQuery.MAX_RESULT) {
+          throw new JsonRpcTooManyResultException(
+              "query returned more than " + LogBlockQuery.MAX_RESULT + " results");
+        }
         logFilterElementList.addAll(matchedLog);
       }
-
-      if (logFilterElementList.size() > LogBlockQuery.MAX_RESULT) {
-        throw new JsonRpcTooManyResultException(
-            "query returned more than " + LogBlockQuery.MAX_RESULT + " results");
-      }
     }
 
     return logFilterElementList.toArray(new LogFilterElement[0]);