CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-24 21:33:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复AndroidClassLoader在多线程并发时可能导致的并发错误

Browse Source
This commit is contained in:
TonyJiangWJ 2022-01-20 21:43:39 +08:00
parent 822f7b2969
commit 0544ab29e1
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
View File

@ -148,22 +148,26 @@ public class AndroidClassLoader extends ClassLoader implements GeneratedClassLoa
logger.debug("dex file size: " + file.length());
DexClassLoader loader = new DexClassLoader(file.getPath(), mCacheDir.getPath(), mLibsDir.getPath(), parent);
// 根据dex文件名 移除已有的，使得最新载入的在LinkedHashMap末尾
mDexClassLoaders.remove(file.getName());
mDexClassLoaders.put(file.getName(), loader);
synchronized (mDexClassLoaders) {
mDexClassLoaders.remove(file.getName());
mDexClassLoaders.put(file.getName(), loader);
}
return loader;
}
/**
* 移除已加载的dex文件
*/
public void unloadAllDex() {
PFiles.deleteFilesOfDir(mCacheDir);
this.mDexClassLoaders.clear();
if (!mCacheDir.exists()) {
mCacheDir.mkdirs();
}
if (!mLibsDir.exists()) {
mLibsDir.mkdir();
public synchronized void unloadAllDex() {
synchronized (mDexClassLoaders) {
PFiles.deleteFilesOfDir(mCacheDir);
this.mDexClassLoaders.clear();
if (!mCacheDir.exists()) {
mCacheDir.mkdirs();
}
if (!mLibsDir.exists()) {
mLibsDir.mkdir();
}
}
}
@ -241,17 +245,19 @@ public class AndroidClassLoader extends ClassLoader implements GeneratedClassLoa
}
}
if (loadedClass == null) {
ListIterator<DexClassLoader> reverseIterator = new ArrayList<>(mDexClassLoaders.values()).listIterator(mDexClassLoaders.size());
while (reverseIterator.hasPrevious()) {
DexClassLoader classLoader = reverseIterator.previous();
synchronized (mDexClassLoaders) {
ListIterator<DexClassLoader> reverseIterator = new ArrayList<>(mDexClassLoaders.values()).listIterator(mDexClassLoaders.size());
while (reverseIterator.hasPrevious()) {
DexClassLoader classLoader = reverseIterator.previous();
// Log.d(LOG_TAG, "try to load class: " + name + " class loader info: " + classLoader.toString());
try {
loadedClass = classLoader.loadClass(name);
} catch (Exception e) {
// do nothing
}
if (loadedClass != null) {
break;
try {
loadedClass = classLoader.loadClass(name);
} catch (Exception e) {
// do nothing
}
if (loadedClass != null) {
break;
}
}
}
}