Mercurial > hg > openjdk > jdk6 > langtools

changeset 67:78efde88dc5a jdk6-b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6886738: multi-thread issue with Name in javac Reviewed-by: darcy Contributed-by: ahe@google.com
author jjg
date Wed, 30 Sep 2009 11:11:03 -0700
parents f754eab3d93a
children a9008b46db24 d398d7a84fd3
files src/share/classes/com/sun/tools/javac/main/JavaCompiler.java src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Mon Sep 28 18:14:23 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Wed Sep 30 11:11:03 2009 -0700
@@ -1419,7 +1419,7 @@
         close(true);
     }
 
-    private void close(boolean disposeNames) {
+    public void close(boolean disposeNames) {
         rootClasses = null;
         reader = null;
         make = null;
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Mon Sep 28 18:14:23 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Wed Sep 30 11:11:03 2009 -0700
@@ -828,7 +828,7 @@
                     topLevelClasses  = List.nil();
                     packageInfoFiles = List.nil();
 
-                    compiler.close();
+                    compiler.close(false);
                     currentContext = contextForNextRound(currentContext, true);
 
                     JavaFileManager fileManager = currentContext.get(JavaFileManager.class);
@@ -876,7 +876,7 @@
         }
         runLastRound(xout, roundNumber, errorStatus, taskListener);
 
-        compiler.close();
+        compiler.close(false);
         currentContext = contextForNextRound(currentContext, true);
         compiler = JavaCompiler.instance(currentContext);
         filer.newRound(currentContext, true);
@@ -910,7 +910,7 @@
         } else if (procOnly) {
             compiler.todo.clear();
         } else { // Final compilation
-            compiler.close();
+            compiler.close(false);
             currentContext = contextForNextRound(currentContext, true);
             compiler = JavaCompiler.instance(currentContext);