diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/io/StreamTokenizer/Comment.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/io/StreamTokenizer/Comment.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 1998 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 4106810 4027740 4078997 4097738
+   @summary Make sure StreamTokenizer will correctly
+            parse different types of comments in input.
+   */
+
+
+import java.io.*;
+
+public class Comment {
+
+    public static void main(String[] args) throws Exception {
+
+        File f = new File(System.getProperty("test.src", "."), "input.txt");
+
+        int slashIsCommentStart = 1;
+        int slashSlashComment = 2;
+        int slashStarComment = 4;
+
+        for (int i = 0; i < 8 ; i++) {
+            StreamTokenizer st = new StreamTokenizer(new FileReader(f));
+
+            /* decide the state of this run */
+            boolean slashCommentFlag = ((i & slashIsCommentStart) != 0);
+            boolean slashSlashCommentFlag = ((i & slashSlashComment) != 0);
+            boolean slashStarCommentFlag = ((i & slashStarComment) != 0);
+
+            /* set the initial state of the tokenizer */
+            if (!slashCommentFlag) {
+                st.ordinaryChar('/');
+            }
+            st.slashSlashComments(slashSlashCommentFlag);
+            st.slashStarComments(slashStarCommentFlag);
+
+            /* now go throgh the input file */
+            while(st.nextToken() != StreamTokenizer.TT_EOF)
+            {
+                String token = st.sval;
+                if (token == null) {
+                    continue;
+                } else {
+                    if ((token.compareTo("Error1") == 0) && slashStarCommentFlag) {
+                        throw new Exception("Failed to pass one line C comments!");
+                    }
+                    if ((token.compareTo("Error2") == 0) && slashStarCommentFlag) {
+                        throw new Exception("Failed to pass multi line C comments!");
+                    }
+                    if ((token.compareTo("Error3") == 0) && slashSlashCommentFlag) {
+                        throw new Exception("Failed to pass C++ comments!");
+                    }
+                    if ((token.compareTo("Error4") == 0) && slashCommentFlag) {
+                        throw new Exception("Failed to pass / comments!");
+                    }
+                }
+            }
+        }
+    }
+}