From 4ecfc1b8d315fccdf3d48de1003e0c637c8ce8bd Mon Sep 17 00:00:00 2001
From: jjg <unknown>
Date: Fri, 7 Sep 2012 11:24:00 -0700
Subject: [PATCH] 7196774: javac cannot be built with JDK 6 after 7151010
 Reviewed-by: mcimadamore

---
 src/share/classes/com/sun/tools/javac/comp/Annotate.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/share/classes/com/sun/tools/javac/comp/Annotate.java
index eae5e943..eb68899a 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -26,7 +26,6 @@
 package com.sun.tools.javac.comp;
 
 import java.util.Map;
-import java.util.Objects;
 
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -151,10 +150,10 @@ public class Annotate {
                                        Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated,
                                        Map<Attribute.Compound, JCDiagnostic.DiagnosticPosition> pos,
                                        Log log) {
-            Objects.requireNonNull(env);
-            Objects.requireNonNull(annotated);
-            Objects.requireNonNull(pos);
-            Objects.requireNonNull(log);
+            Assert.checkNonNull(env);
+            Assert.checkNonNull(annotated);
+            Assert.checkNonNull(pos);
+            Assert.checkNonNull(log);
 
             this.env = env;
             this.annotated = annotated;
-- 
GitLab