diff --git a/java_indexer/lib/java-symbol-solver-core.jar b/java_indexer/lib/java-symbol-solver-core.jar index 3818af1e..c015a3bc 100644 Binary files a/java_indexer/lib/java-symbol-solver-core.jar and b/java_indexer/lib/java-symbol-solver-core.jar differ diff --git a/java_indexer/lib/java-symbol-solver-logic.jar b/java_indexer/lib/java-symbol-solver-logic.jar index 219eebf0..b4acb4d4 100644 Binary files a/java_indexer/lib/java-symbol-solver-logic.jar and b/java_indexer/lib/java-symbol-solver-logic.jar differ diff --git a/java_indexer/lib/java-symbol-solver-model.jar b/java_indexer/lib/java-symbol-solver-model.jar index ebcb497d..6cdc3c8a 100644 Binary files a/java_indexer/lib/java-symbol-solver-model.jar and b/java_indexer/lib/java-symbol-solver-model.jar differ diff --git a/java_indexer/src/main/java/com/sourcetrail/JavaIndexer.java b/java_indexer/src/main/java/com/sourcetrail/JavaIndexer.java index 424e4e56..b2c6ce17 100644 --- a/java_indexer/src/main/java/com/sourcetrail/JavaIndexer.java +++ b/java_indexer/src/main/java/com/sourcetrail/JavaIndexer.java @@ -30,7 +30,7 @@ public class JavaIndexer { AstVisitorClient astVisitorClient = new JavaIndexerAstVisitorClient(address); - astVisitorClient.logInfo( "indexing source file: " + filePath); + astVisitorClient.logInfo("indexing source file: " + filePath); try { @@ -48,28 +48,35 @@ public class JavaIndexer } else { - TypeSolver typeSolver = null; - - if (path.endsWith(".jar")) + try { - try + TypeSolver typeSolver = null; + + if (path.endsWith(".jar")) { - typeSolver = new JarTypeSolver(path); + try + { + typeSolver = new JarTypeSolver(path); + } + catch (IOException e) + { + System.out.println("unable to add jar file: " + path); + } } - catch (IOException e) + else if (!path.isEmpty()) { - System.out.println("unable to add jar file: " + path); + typeSolver = new SynchronizedJavaParserTypeSolver(new File(path)); + } + + if (typeSolver != null) + { + typeSolvers.put(path, typeSolver); + combinedTypeSolver.add(typeSolver); } } - else if (!path.isEmpty()) + catch (Exception e) { - typeSolver = new SynchronizedJavaParserTypeSolver(new File(path)); - } - - if (typeSolver != null) - { - typeSolvers.put(path, typeSolver); - combinedTypeSolver.add(typeSolver); + astVisitorClient.logWarning("unable to add dependency: " + path); } } }