diff -r fd16c54261b3 -r 06bc494ca11e langtools/test/tools/javac/api/T6358786.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/api/T6358786.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2005-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     6358786
+ * @summary Doccomments are not returned from Tree API
+ * @author  Peter von der Ah\u00e9
+ * @run main T6358786 T6358786.java
+ */
+
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.util.JavacFileManager;
+import java.util.Arrays;
+
+import javax.lang.model.util.Elements;
+import java.io.*;
+import javax.lang.model.element.TypeElement;
+import javax.tools.*;
+
+/**
+ * Tests that doccomments are available from the Tree API.
+ */
+public class T6358786 {
+    public static void main(String... args) throws IOException {
+        JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
+        StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
+        String srcdir = System.getProperty("test.src");
+        File file = new File(srcdir, args[0]);
+        JavacTaskImpl task = (JavacTaskImpl)tool.getTask(null, fm, null, null, null, fm.getJavaFileObjectsFromFiles(Arrays.asList(file)));
+        Elements elements = task.getElements();
+        for (TypeElement clazz : task.enter(task.parse())) {
+            String doc = elements.getDocComment(clazz);
+            if (doc == null)
+                throw new AssertionError(clazz.getSimpleName() + ": no doc comment");
+            System.out.format("%s: %s%n", clazz.getSimpleName(), doc);
+        }
+    }
+}