SendTransactionError parse bug deal data is null (#48)

* SendTransactionError parse bug deal data is null
Conflux-Chain · Aug 30, 2023 · 923dd3c · 923dd3c
1 parent f38d890
commit 923dd3c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### 1.2.10
+
+1. Fix SendTransactionError parse method to handle data is null
+
 ### 1.2.6
 * Add support for Batch Requests
 

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = 'io.github.conflux-chain'
-version = '1.2.9'   // SNAPSHOT
+version = '1.2.10'   // SNAPSHOT
 
 repositories {
     jcenter()

diff --git a/src/main/java/conflux/web3j/types/SendTransactionError.java b/src/main/java/conflux/web3j/types/SendTransactionError.java
@@ -31,6 +31,9 @@ private SendTransactionError(String prefix, String... texts) {
 	}
 
 	private boolean matches(String message) {
+		if (message == null) {
+			return false;
+		}
 		if (this.prefix != null && !message.startsWith(this.prefix)) {
 			return false;
 		}
@@ -61,11 +64,11 @@ public static SendTransactionError parse(Error rpcError) {
 		String data = rpcError.getData();
 		if (data != null) {
 			data = data.replace("\"", "").replace("\\", "");
-		}
-
-		for (SendTransactionError error : SendTransactionError.values()) {
-			if (error.matches(data)) {
-				return error;
+
+			for (SendTransactionError error : SendTransactionError.values()) {
+				if (error.matches(data)) {
+					return error;
+				}
 			}
 		}