Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Tue Sep 07 15:49:48 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Thu Sep 09 09:42:45 2010 +0530
     1.3 @@ -872,8 +872,13 @@
     1.4  
     1.5          //parse all files
     1.6          ListBuffer<JCCompilationUnit> trees = lb();
     1.7 -        for (JavaFileObject fileObject : fileObjects)
     1.8 -            trees.append(parse(fileObject));
     1.9 +        Set<JavaFileObject> filesSoFar = new HashSet<JavaFileObject>();
    1.10 +        for (JavaFileObject fileObject : fileObjects) {
    1.11 +            if (!filesSoFar.contains(fileObject)) {
    1.12 +                filesSoFar.add(fileObject);
    1.13 +                trees.append(parse(fileObject));
    1.14 +            }
    1.15 +        }
    1.16          return trees.toList();
    1.17      }
    1.18  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/T6900149.java	Thu Sep 09 09:42:45 2010 +0530
     2.3 @@ -0,0 +1,50 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 6900149
    2.30 + * @summary IllegalStateException when compiling same files and DiagnosticListener is set
    2.31 + */
    2.32 +
    2.33 +import java.io.*;
    2.34 +import java.util.*;
    2.35 +import javax.tools.*;
    2.36 +import javax.tools.JavaCompiler.CompilationTask;
    2.37 +
    2.38 +public class T6900149 {
    2.39 +    public static void main(String[] args) throws IOException {
    2.40 +        DiagnosticCollector<JavaFileObject> diag =
    2.41 +                new DiagnosticCollector<JavaFileObject>();
    2.42 +        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
    2.43 +        StandardJavaFileManager fm =
    2.44 +                compiler.getStandardFileManager(null, null, null);
    2.45 +        File emptyFile = File.createTempFile("Empty", ".java");
    2.46 +        File[] files = new File[] { emptyFile, emptyFile };
    2.47 +        CompilationTask task = compiler.getTask(null, fm, diag,
    2.48 +                null, null, fm.getJavaFileObjects(files));
    2.49 +        if (! task.call()) {
    2.50 +            throw new AssertionError("compilation failed");
    2.51 +        }
    2.52 +    }
    2.53 +}