Fri, 07 Sep 2012 11:24:00 -0700
7196774: javac cannot be built with JDK 6 after 7151010
Reviewed-by: mcimadamore
src/share/classes/com/sun/tools/javac/comp/Annotate.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java Fri Sep 07 11:12:16 2012 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java Fri Sep 07 11:24:00 2012 -0700 1.3 @@ -26,7 +26,6 @@ 1.4 package com.sun.tools.javac.comp; 1.5 1.6 import java.util.Map; 1.7 -import java.util.Objects; 1.8 1.9 import com.sun.tools.javac.util.*; 1.10 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; 1.11 @@ -151,10 +150,10 @@ 1.12 Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated, 1.13 Map<Attribute.Compound, JCDiagnostic.DiagnosticPosition> pos, 1.14 Log log) { 1.15 - Objects.requireNonNull(env); 1.16 - Objects.requireNonNull(annotated); 1.17 - Objects.requireNonNull(pos); 1.18 - Objects.requireNonNull(log); 1.19 + Assert.checkNonNull(env); 1.20 + Assert.checkNonNull(annotated); 1.21 + Assert.checkNonNull(pos); 1.22 + Assert.checkNonNull(log); 1.23 1.24 this.env = env; 1.25 this.annotated = annotated;