Merge "81638: Execution failed > PermGen space" into studio-1.1-dev

1 files changed, 6 insertions, 0 deletions

diff --git a/lint/cli/src/main/java/com/android/tools/lint/EcjParser.java b/lint/cli/src/main/java/com/android/tools/lint/EcjParser.java
index a4ee3a26c4..d7fc0097ce 100644
--- a/lint/cli/src/main/java/com/android/tools/lint/EcjParser.java
+++ b/lint/cli/src/main/java/com/android/tools/lint/EcjParser.java
@@ -260,6 +260,8 @@ public class EcjParser extends JavaParser {
         try {
             compiler.compile(sourceUnits.toArray(new ICompilationUnit[sourceUnits.size()]));
         } catch (OutOfMemoryError e) {
+            environment.cleanup();
+
             // Since we're running out of memory, if it's all still held we could potentially
             // fail attempting to log the failure. Actively get rid of the large ECJ data
             // structure references first so minimize the chance of that
@@ -296,6 +298,10 @@ public class EcjParser extends JavaParser {
             } else {
                 t.printStackTrace();
             }
+        } finally {
+            if (environment != null) {
+                environment.cleanup();
+            }
         }
     }