--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java	Fri Jan 30 23:28:38 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java	Fri Feb 06 10:23:57 2009 -0800
@@ -406,8 +406,7 @@
                 }
             }
 
-            if (comp.errorCount() != 0 ||
-                options.get("-Werror") != null && comp.warningCount() != 0)
+            if (comp.errorCount() != 0)
                 return EXIT_ERROR;
         } catch (IOException ex) {
             ioMessage(ex);