Merge pull request #35 from josh-richardson/fix-exception-stacktrace

return something more sane if fund fails
hyperledger · Feb 26, 2020 · 95eb84b · 95eb84b
2 parents 123e5e3 + 72d248e
commit 95eb84b
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/main/java/org/web3j/console/WalletFunder.java b/src/main/java/org/web3j/console/WalletFunder.java
@@ -171,20 +171,22 @@ public static String fundWallet(String walletAddress, Faucet faucet, String toke
                             .post(fundingBody)
                             .build();
         }
+        try {
+            Response sendRawResponse = client.newCall(sendEtherRequest).execute();
 
-        Response sendRawResponse = client.newCall(sendEtherRequest).execute();
-
-        if (sendRawResponse.code() != 200) {
-            exitError(
-                    String.format(
-                            "\nAn HTTP request failed with code: %d", sendRawResponse.code()));
-        }
-
-        String sendResponse = sendRawResponse.body().string();
+            if (sendRawResponse.code() != 200) {
+                exitError(
+                        String.format(
+                                "\nAn HTTP request failed with code: %d", sendRawResponse.code()));
+            }
 
-        WalletFunderResult result = mapper.readValue(sendResponse, WalletFunderResult.class);
+            String sendResponse = sendRawResponse.body().string();
 
-        return result.result;
+            WalletFunderResult result = mapper.readValue(sendResponse, WalletFunderResult.class);
+            return result.result;
+        } catch (Exception ex) {
+            return "The fund operation failed - this may be due to an issue with the remote server. Please try again.";
+        }
     }
 }