Merge pull request #2130 from Shohou/2120_all_exceptions

fixes #2120 - catch all exceptions during response parsing
hyperledger-web3j · Dec 17, 2024 · 6785725 · 6785725
2 parents 286b63d + 2333470
commit 6785725
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 * fixed several code issues found by sonar [#2113](https://github.com/hyperledger/web3j/pull/2113)
 * update GitHub actions versions [#2114](https://github.com/hyperledger/web3j/pull/2114)
+* fixed request parsing exception handling [#2120](https://github.com/hyperledger/web3j/pull/2120)
 * fixed subscription object leaking after disconnect [#2121](https://github.com/hyperledger/web3j/pull/2121)
 
 ### Features

diff --git a/core/src/main/java/org/web3j/protocol/websocket/WebSocketService.java b/core/src/main/java/org/web3j/protocol/websocket/WebSocketService.java
@@ -299,7 +299,7 @@ private void processRequestReply(String replyStr, JsonNode replyJson) throws IOE
             }
 
             sendReplyToListener(request, reply);
-        } catch (IllegalArgumentException e) {
+        } catch (Exception e) {
             sendExceptionToListener(replyStr, request, e);
         }
     }
@@ -322,7 +322,7 @@ private void processBatchRequestReply(String replyStr, ArrayNode replyJson) thro
             }
 
             sendReplyToListener(webSocketRequests, new BatchResponse(requests, responses));
-        } catch (IllegalArgumentException e) {
+        } catch (Exception e) {
             sendExceptionToListener(replyStr, webSocketRequests, e);
         }
     }
@@ -375,7 +375,7 @@ private void sendReplyToListener(WebSocketRequest request, Object reply) {
     }
 
     private void sendExceptionToListener(
-            String replyStr, WebSocketRequest request, IllegalArgumentException e) {
+            String replyStr, WebSocketRequest request, Exception e) {
         request.getOnReply()
                 .completeExceptionally(
                         new IOException(