From 3fdc4e51c9b4bab5b2f2f17c3cfd0cf06d9f9d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=85=E8=8C=B6?= <RinOrz666@gmail.com>
Date: Fri, 25 Feb 2022 18:37:06 +0800
Subject: [PATCH] Fix cache deadlock in `XposedHelpers.java` (#1723)

---
 .../de/robv/android/xposed/XposedHelpers.java | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/de/robv/android/xposed/XposedHelpers.java b/core/src/main/java/de/robv/android/xposed/XposedHelpers.java
index 7dd28ba4..a0495fbf 100644
--- a/core/src/main/java/de/robv/android/xposed/XposedHelpers.java
+++ b/core/src/main/java/de/robv/android/xposed/XposedHelpers.java
@@ -520,16 +520,16 @@ public final class XposedHelpers {
      * @throws NoSuchMethodError In case no suitable method was found.
      */
     public static Method findMethodBestMatch(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
+        // find the exact matching method first
+        try {
+            return findMethodExact(clazz, methodName, parameterTypes);
+        } catch (NoSuchMethodError ignored) {
+        }
+
+        // then find the best match
         var key = new MemberCacheKey.Method(clazz, methodName, parameterTypes, false);
 
         return methodCache.computeIfAbsent(key, k -> {
-            // find the exact matching method first
-            try {
-                return Optional.of(findMethodExact(k.clazz, k.name, k.parameters));
-            } catch (NoSuchMethodError ignored) {
-            }
-
-            // then find the best match
             Method bestMatch = null;
             Class<?> clz = k.clazz;
             boolean considerPrivateMethods = true;
@@ -712,7 +712,7 @@ public final class XposedHelpers {
 
         return constructorCache.computeIfAbsent(key, k -> {
             try {
-                Constructor<?> constructor = clazz.getDeclaredConstructor(parameterTypes);
+                Constructor<?> constructor = k.clazz.getDeclaredConstructor(k.parameters);
                 constructor.setAccessible(true);
                 return Optional.of(constructor);
             } catch (NoSuchMethodException e) {
@@ -749,16 +749,16 @@ public final class XposedHelpers {
      * <p>See {@link #findMethodBestMatch(Class, String, Class...)} for details.
      */
     public static Constructor<?> findConstructorBestMatch(Class<?> clazz, Class<?>... parameterTypes) {
+        // find the exact matching constructor first
+        try {
+            return findConstructorExact(clazz, parameterTypes);
+        } catch (NoSuchMethodError ignored) {
+        }
+
+        // then find the best match
         var key = new MemberCacheKey.Constructor(clazz, parameterTypes, false);
 
         return constructorCache.computeIfAbsent(key, k -> {
-            // find the exact matching constructor first
-            try {
-                return Optional.of(findConstructorExact(k.clazz, k.parameters));
-            } catch (NoSuchMethodError ignored) {
-            }
-
-            // then find the best match
             Constructor<?> bestMatch = null;
             Constructor<?>[] constructors = k.clazz.getDeclaredConstructors();
             for (Constructor<?> constructor : constructors) {