1.1 --- a/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java Thu Feb 05 16:26:36 2015 +0100 1.2 +++ b/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java Thu Feb 05 19:08:00 2015 +0530 1.3 @@ -91,6 +91,7 @@ 1.4 import java.util.Arrays; 1.5 import java.util.Collections; 1.6 import java.util.List; 1.7 +import java.util.Objects; 1.8 import java.util.StringTokenizer; 1.9 import java.util.WeakHashMap; 1.10 import jdk.internal.dynalink.CallSiteDescriptor; 1.11 @@ -123,9 +124,9 @@ 1.12 * in fact return a weakly-referenced canonical instance. 1.13 */ 1.14 public static CallSiteDescriptor create(final Lookup lookup, final String name, final MethodType methodType) { 1.15 - name.getClass(); // NPE check 1.16 - methodType.getClass(); // NPE check 1.17 - lookup.getClass(); // NPE check 1.18 + Objects.requireNonNull(name); 1.19 + Objects.requireNonNull(methodType); 1.20 + Objects.requireNonNull(lookup); 1.21 final String[] tokenizedName = tokenizeName(name); 1.22 if(isPublicLookup(lookup)) { 1.23 return getCanonicalPublicDescriptor(createPublicCallSiteDescriptor(tokenizedName, methodType));