From 470328a85fa24b12c75899edff6e9e0be3af8dd9 Mon Sep 17 00:00:00 2001
From: Wesley Elias Ribeiro <wesleyer@fb.com>
Date: Thu, 31 May 2018 17:13:30 -0700
Subject: [PATCH] Improve error message on so loading failure

Summary: If the exception cause does not have a message, log the toString() of the exception

Differential Revision: D8230263

fbshipit-source-id: d02d0b71f584e9dd82cb0f9bd4d2ee90c3218de9
---
 java/com/facebook/soloader/SoLoader.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/com/facebook/soloader/SoLoader.java b/java/com/facebook/soloader/SoLoader.java
index 902b3e8..4809420 100644
--- a/java/com/facebook/soloader/SoLoader.java
+++ b/java/com/facebook/soloader/SoLoader.java
@@ -693,7 +693,11 @@ private static void doLoadLibraryBySoName(
           || result == SoSource.LOAD_RESULT_CORRUPTED_LIB_FILE) {
         String message = "couldn't find DSO to load: " + soName;
         if (error != null) {
-          message += " caused by: " + error.getMessage();
+          String cause = error.getMessage();
+          if (cause == null) {
+            cause = error.toString();
+          }
+          message += " caused by: " + cause;
         }
         Log.e(TAG, message);
         throw new UnsatisfiedLinkError(message);