Fixing memory leak in JavaExtractor

urialon · urialon · commit 6172bea66300 · 2019-01-10T16:59:55.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.class
+*.lst
diff --git a/JavaExtractor/JPredict/src/main/java/JavaExtractor/ExtractFeaturesTask.java b/JavaExtractor/JPredict/src/main/java/JavaExtractor/ExtractFeaturesTask.java
@@ -18,19 +18,11 @@
 
 public class ExtractFeaturesTask implements Callable<Void> {
 	CommandLineValues m_CommandLineValues;
-	CompilationUnit m_CompilationUnit;
-	String code = null;
 	Path filePath;
 
 	public ExtractFeaturesTask(CommandLineValues commandLineValues, Path path) {
 		m_CommandLineValues = commandLineValues;
 		this.filePath = path;
-		try {
-			this.code = new String(Files.readAllBytes(path));
-		} catch (IOException e) {
-			e.printStackTrace();
-			this.code = Common.EmptyString;
-		}
 	}
 
 	@Override
@@ -52,19 +44,24 @@ public void processFile() {
 		if (features == null) {
 			return;
 		}
-		
+
 		String toPrint = featuresToString(features);
 		if (toPrint.length() > 0) {
-			System.out.println(toPrint);				
+			System.out.println(toPrint);
 		}
 	}
 
 	public ArrayList<ProgramFeatures> extractSingleFile() throws ParseException, IOException {
-		FeatureExtractor featureExtractor = new FeatureExtractor(m_CommandLineValues, code);
-
-		ArrayList<ProgramFeatures> features = featureExtractor.extractFeatures();
+		String code = null;
+		try {
+			code = new String(Files.readAllBytes(this.filePath));
+		} catch (IOException e) {
+			e.printStackTrace();
+			code = Common.EmptyString;
+		}
+		FeatureExtractor featureExtractor = new FeatureExtractor(m_CommandLineValues);
 
-		m_CompilationUnit = featureExtractor.getParsedFile();
+		ArrayList<ProgramFeatures> features = featureExtractor.extractFeatures(code);
 
 		return features;
 	}
diff --git a/JavaExtractor/JPredict/src/main/java/JavaExtractor/FeatureExtractor.java b/JavaExtractor/JPredict/src/main/java/JavaExtractor/FeatureExtractor.java
@@ -22,8 +22,6 @@
 
 @SuppressWarnings("StringEquality")
 public class FeatureExtractor {
-	private String code;
-	private CompilationUnit m_CompilationUnit;
 	private CommandLineValues m_CommandLineValues;
 	private static Set<String> s_ParentTypeToAddChildId = Stream
 			.of("AssignExpr", "ArrayAccessExpr", "FieldAccessExpr", "MethodCallExpr")
@@ -34,20 +32,15 @@ public class FeatureExtractor {
 	final static String upSymbol = "^";
 	final static String downSymbol = "_";
 
-	public FeatureExtractor(CommandLineValues commandLineValues, String code) {
+	public FeatureExtractor(CommandLineValues commandLineValues) {
 		this.m_CommandLineValues = commandLineValues;
-		this.code = code;
 	}
 
-	public CompilationUnit getParsedFile() {
-		return m_CompilationUnit;
-	}
-
-	public ArrayList<ProgramFeatures> extractFeatures() throws ParseException, IOException {
-		m_CompilationUnit = parseFileWithRetries(code);
+	public ArrayList<ProgramFeatures> extractFeatures(String code) throws ParseException, IOException {
+		CompilationUnit compilationUnit = parseFileWithRetries(code);
 		FunctionVisitor functionVisitor = new FunctionVisitor();
 
-		functionVisitor.visit(m_CompilationUnit, null);
+		functionVisitor.visit(compilationUnit, null);
 
 		ArrayList<MethodContent> methods = functionVisitor.getMethodContents();
 		ArrayList<ProgramFeatures> programs = generatePathFeatures(methods);
diff --git a/JavaExtractor/JPredict/target/JavaExtractor-0.0.1-SNAPSHOT.jar b/JavaExtractor/JPredict/target/JavaExtractor-0.0.1-SNAPSHOT.jar
