test/tools/javac/ConditionalArgTypes_2.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. 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.

@@ -25,11 +25,10 @@
  * @test
  * @bug 4312781 4881179 4949543
  * @summary Verify that both branches of a conditional expression must agree in type.
  * @author maddox
  *
- * @compile/fail -source 1.4 ConditionalArgTypes_2.java
  * @compile                  ConditionalArgTypes_2.java
  */
 
 // This case was working before -- controlling expression is not a constant.