--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/api/T6357331.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6357331
+ * @summary NPE from JavacTask.getElements() after calling CompilationTask.run
+ */
+import java.io.*;
+import java.util.Arrays;
+import javax.tools.*;
+import com.sun.source.util.*;
+
+public class T6357331
+{
+    public static void main(String... args) {
+        JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
+        PrintWriter out = new PrintWriter(new StringWriter());
+        final JavacTask task = (JavacTask) (tool.getTask(out, null, null, null, null, null));
+
+        // set a listener to verify that IllegalStateException is not thrown
+        // during the compilation
+        task.setTaskListener(new TaskListener() {
+                public void started(TaskEvent e) {
+                    task.getElements();
+                    task.getTypes();
+                }
+                public void finished(TaskEvent e) { }
+            });
+
+        task.call();
+
+        // now the compilation is over, we expect IllegalStateException (not NPE)
+        try {
+            task.getElements();
+            throw new AssertionError("IllegalStateException not thrown");
+        }
+        catch (IllegalStateException e) {
+            // expected
+        }
+
+        try {
+            task.getTypes();
+            throw new AssertionError("IllegalStateException not thrown");
+        }
+        catch (IllegalStateException e) {
+            // expected
+        }
+    }
+}