Merge pull request Meituan-Dianping#233 from limengyun2008/master

修复一个PatchControl类isSupport可能会多重匹配的bug。
3shao · Feb 4, 2018 · 15121da · 15121da
2 parents d364b18 + 67b5359
commit 15121da
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/auto-patch-plugin/src/main/java/com/meituan/robust/autopatch/PatchesControlFactory.java b/auto-patch-plugin/src/main/java/com/meituan/robust/autopatch/PatchesControlFactory.java
@@ -165,14 +165,15 @@ private static String getIsSupportMethodBody(CtClass patchClass, String modified
             Integer methodNumber = Config.methodMap.get(methodLongName);
             //just Forward methods with methodNumber
             if (methodNumber != null) {
-                methodsIdBuilder.append(methodNumber + ":");
+                // 一前一后的冒号作为匹配锚点，只有一边有的话可能会有多重匹配的bug
+                methodsIdBuilder.append(":" + methodNumber + ":");
             }
         }
 
         if (Constants.isLogging) {
-            isSupportBuilder.append("  android.util.Log.d(\"robust\",\"arrivied in isSupport \"+methodName+\" paramArrayOfObject  \" +paramArrayOfObject+\" isSupport result is \"+\"" + methodsIdBuilder.toString() + "\".contains(methodNo));");
+            isSupportBuilder.append("  android.util.Log.d(\"robust\",\"arrivied in isSupport \"+methodName+\" paramArrayOfObject  \" +paramArrayOfObject+\" isSupport result is \"+\"" + methodsIdBuilder.toString() + "\".contains(\":\" + methodNo + \":\"));");
         }
-        isSupportBuilder.append("return \"" + methodsIdBuilder.toString() + "\".contains(methodNo);");
+        isSupportBuilder.append("return \"" + methodsIdBuilder.toString() + "\".contains(\":\" + methodNo + \":\");");
         return isSupportBuilder.toString();
     }