1.1 --- a/src/jdk/nashorn/internal/objects/Global.java Thu Feb 05 16:26:36 2015 +0100 1.2 +++ b/src/jdk/nashorn/internal/objects/Global.java Thu Feb 05 19:08:00 2015 +0530 1.3 @@ -41,6 +41,7 @@ 1.4 import java.util.Arrays; 1.5 import java.util.List; 1.6 import java.util.Map; 1.7 +import java.util.Objects; 1.8 import java.util.concurrent.Callable; 1.9 import java.util.concurrent.ConcurrentHashMap; 1.10 import javax.script.ScriptContext; 1.11 @@ -463,8 +464,7 @@ 1.12 sm.checkPermission(new RuntimePermission(Context.NASHORN_CREATE_GLOBAL)); 1.13 } 1.14 1.15 - // null check on context 1.16 - context.getClass(); 1.17 + Objects.requireNonNull(context); 1.18 1.19 return $nasgenmap$; 1.20 } 1.21 @@ -488,7 +488,7 @@ 1.22 */ 1.23 public static Global instance() { 1.24 final Global global = Context.getGlobal(); 1.25 - global.getClass(); // null check 1.26 + Objects.requireNonNull(global); 1.27 return global; 1.28 } 1.29