--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Wed Aug 19 17:12:36 2009 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Fri Aug 21 11:25:45 2009 -0700
@@ -78,6 +78,10 @@
      */
     public boolean emitWarnings;
 
+    /** Switch: suppress note messages.
+     */
+    public boolean suppressNotes;
+
     /** Print stack trace on errors?
      */
     public boolean dumpOnError;
@@ -121,6 +125,7 @@
         this.dumpOnError = options.get("-doe") != null;
         this.promptOnError = options.get("-prompt") != null;
         this.emitWarnings = options.get("-Xlint:none") == null;
+        this.suppressNotes = options.get("suppressNotes") != null;
         this.MaxErrors = getIntOption(options, "-Xmaxerrs", 100);
         this.MaxWarnings = getIntOption(options, "-Xmaxwarns", 100);
 
@@ -324,7 +329,7 @@
             // Print out notes only when we are permitted to report warnings
             // Notes are only generated at the end of a compilation, so should be small
             // in number.
-            if (emitWarnings || diagnostic.isMandatory()) {
+            if ((emitWarnings || diagnostic.isMandatory()) && !suppressNotes) {
                 writeDiagnostic(diagnostic);
             }
             break;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T6873849.java	Fri Aug 21 11:25:45 2009 -0700
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @bug 6873849
+ * @summary suppress notes generated by javac
+ */
+
+public class T6873849 {
+    public static void main(String... args) throws Exception {
+        new T6873849().run();
+    }
+
+    public void run() throws Exception {
+        test(null, "- compiler.note.unchecked.filename: T6873849.java" + newline +
+                    "- compiler.note.unchecked.recompile" + newline);
+        test("-XDsuppressNotes", "");
+    }
+
+    void test(String opt, String expect) throws Exception {
+        List<String> args = new ArrayList<String>();
+        if (opt != null)
+            args.add(opt);
+        args.add("-d");
+        args.add(testClasses.getPath());
+        args.add("-XDrawDiagnostics");
+        args.add(new File(testSrc, "T6873849.java").getPath());
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        System.err.println("compile: " + args);
+        int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
+        pw.close();
+        String out = sw.toString();
+        System.out.println(out);
+        if (rc != 0)
+            throw new Exception("compilation failed unexpectedly");
+        if (!out.equals(expect))
+            throw new Exception("unexpected output from compiler");
+    }
+
+    void m(List t) {
+        // force a note about unchecked usage
+        t.add(new Object());
+    }
+
+    private File testSrc = new File(System.getProperty("test.src", "."));
+    private File testClasses = new File(System.getProperty("test.classes", "."));
+    private String newline = System.getProperty("line.separator");
+}