--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Tue Oct 07 15:16:17 2014 +0200
+++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Thu Oct 09 04:48:12 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -956,11 +956,11 @@
      * @see  #defineClass(String, byte[], int, int)
      */
     protected final void resolveClass(Class<?> c) {
-        resolveClass0(c);
+        if (c == null) {
+            throw new NullPointerException();
+        }
     }
 
-    private native void resolveClass0(Class<?> c);
-
     /**
      * Finds a class with the specified <a href="#name">binary name</a>,
      * loading it if necessary.