Skip to content

Commit

Permalink
Fix conflit
Browse files Browse the repository at this point in the history
  • Loading branch information
rubnogueira committed Jun 27, 2020
2 parents 7da7938 + e37576c commit 9b3618f
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.report.GeneralReportModule;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
import java.io.BufferedReader;
import java.io.FileReader;

/**
* Finds and loads Autopsy modules written using the Jython variant of the
Expand Down Expand Up @@ -108,7 +110,7 @@ private static <T> List<T> getInterfaceImplementations(LineFilter filter, Class<
if (file.isDirectory()) {
File[] pythonScripts = file.listFiles(new PythonScriptFileFilter());
for (File script : pythonScripts) {
try (Scanner fileScanner = new Scanner(script)) {
try (Scanner fileScanner = new Scanner(new BufferedReader(new FileReader(script)))) {
while (fileScanner.hasNextLine()) {
String line = fileScanner.nextLine();
if (line.startsWith("class ") && filter.accept(line)) { //NON-NLS
Expand Down

0 comments on commit 9b3618f

Please sign in to comment.