Fix handling of suppressed exception am: 74e66b8013 am: a257da82d2
am: 0f710c5d3c
* commit '0f710c5d3c592f61b0ed77ff071d57df318f1930':
Fix handling of suppressed exception
Change-Id: I4b4aef29ab5156b06932c85dca1e22f33b76ee7f
diff --git a/library/src/android/support/multidex/MultiDex.java b/library/src/android/support/multidex/MultiDex.java
index 1e04c19..982bfbf 100644
--- a/library/src/android/support/multidex/MultiDex.java
+++ b/library/src/android/support/multidex/MultiDex.java
@@ -425,9 +425,9 @@
Log.w(TAG, "Exception in makeDexElement", e);
}
Field suppressedExceptionsField =
- findField(loader, "dexElementsSuppressedExceptions");
+ findField(dexPathList, "dexElementsSuppressedExceptions");
IOException[] dexElementsSuppressedExceptions =
- (IOException[]) suppressedExceptionsField.get(loader);
+ (IOException[]) suppressedExceptionsField.get(dexPathList);
if (dexElementsSuppressedExceptions == null) {
dexElementsSuppressedExceptions =
@@ -443,7 +443,7 @@
dexElementsSuppressedExceptions = combined;
}
- suppressedExceptionsField.set(loader, dexElementsSuppressedExceptions);
+ suppressedExceptionsField.set(dexPathList, dexElementsSuppressedExceptions);
}
}