jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gui): resolve exceptions during index (#812)

Browse Source
This commit is contained in:
Skylot
2019-12-23 19:12:00 +00:00
parent 3b9b103c3f
commit af6f8b5391
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/api/JavaClass.java
+1 -1
View File
@@ -73,7 +73,7 @@ public final class JavaClass implements JavaNode {
return cls;
}
private void loadLists() {
private synchronized void loadLists() {
if (listsLoaded) {
return;
}
jadx-gui/src/main/java/jadx/gui/utils/CodeUsageInfo.java
+13 -5
View File
@@ -6,6 +6,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jadx.api.CodePosition;
import jadx.api.JavaClass;
import jadx.api.JavaNode;
@@ -14,6 +17,7 @@ import jadx.gui.treemodel.JNode;
import jadx.gui.utils.search.StringRef;
public class CodeUsageInfo {
private static final Logger LOG = LoggerFactory.getLogger(CodeUsageInfo.class);
public static class UsageInfo {
private final List<CodeNode> usageList = new ArrayList<>();
@@ -36,11 +40,15 @@ public class CodeUsageInfo {
private final Map<JNode, UsageInfo> usageMap = new ConcurrentHashMap<>();
public void processClass(JavaClass javaClass, CodeLinesInfo linesInfo, List<StringRef> lines) {
Map<CodePosition, JavaNode> usage = javaClass.getUsageMap();
for (Map.Entry<CodePosition, JavaNode> entry : usage.entrySet()) {
CodePosition codePosition = entry.getKey();
JavaNode javaNode = entry.getValue();
addUsage(nodeCache.makeFrom(javaNode), javaClass, linesInfo, codePosition, lines);
try {
Map<CodePosition, JavaNode> usage = javaClass.getUsageMap();
for (Map.Entry<CodePosition, JavaNode> entry : usage.entrySet()) {
CodePosition codePosition = entry.getKey();
JavaNode javaNode = entry.getValue();
addUsage(nodeCache.makeFrom(javaNode), javaClass, linesInfo, codePosition, lines);
}
} catch (Exception e) {
LOG.error("Code usage process failed for class: {}", javaClass, e);
}
}