--- old/src/share/vm/prims/whitebox.cpp	2013-04-16 20:17:01.826810548 +0400
+++ new/src/share/vm/prims/whitebox.cpp	2013-04-16 20:17:01.750810551 +0400
@@ -434,8 +434,25 @@
       Handle loader(ikh->class_loader());
       if (loader.is_null()) {
         ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
-        jint result = env->RegisterNatives(wbclass, methods, sizeof(methods)/sizeof(methods[0]));
-        if (result == 0) {
+        bool result = true;
+        //  one by one registration natives for exception catching
+        for (int i = 0, n = sizeof(methods) / sizeof(methods[0]); i < n; ++i) {
+          if (env->RegisterNatives(wbclass, methods + i, 1) != 0) {
+            result &= false;
+            if (env->ExceptionCheck()) {
+              tty->print_cr("Warning: exception on register of sun.hotspot.WhiteBox::%s%s", methods[i].name, methods[i].signature);
+              env->ExceptionClear();
+              result &= false;
+            } else {
+              // register is failed w/o exception
+              env->UnregisterNatives(wbclass);
+              result &= false;
+              break;
+            }
+          }
+        }
+
+        if (result) {
           WhiteBox::set_used();
         }
       }
--- /dev/null	2013-04-15 12:30:09.841410950 +0400
+++ new/test/sanity/WBRegisterNatives.sh	2013-04-16 20:17:02.062810539 +0400
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# Copyright (c) 2013, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+##
+## @test
+## @bug 8011675
+## @summary verify that whitebox can be used even if not all functions are declared in java-part
+## @author igor.ignatyev@oracle.com
+## @run shell WBRegisterNatives.sh
+##
+
+if [ "${TESTSRC}" = "" ]
+then
+  TESTSRC=${PWD}
+  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
+fi
+echo "TESTSRC=${TESTSRC}"
+
+## Adding common setup Variables for running shell tests.
+. ${TESTSRC}/../test_env.sh
+
+mkdir -p .${FS}sun${FS}hotspot
+WHITEBOX_SRC=.${FS}sun${FS}hotspot${FS}WhiteBox.java
+
+# creating sun.hotspot.WhiteBox class with only one existed method
+cat << EOF > $WHITEBOX_SRC
+package sun.hotspot;
+
+public class WhiteBox {
+  private static native void registerNatives();
+  static { registerNatives(); }
+
+  public native int notExistedMethod();
+  public native int getHeapOopSize();
+
+  public static void main(String[] args) {
+    WhiteBox wb = new WhiteBox();
+    if (wb.getHeapOopSize() < 0) {
+      throw new Error("wb.getHeapOopSize() < 0");
+    }
+    boolean catched = false;
+    try {
+      wb.notExistedMethod();
+    } catch (UnsatisfiedLinkError e) {
+      catched = true;
+    }
+    if (!catched) {
+      throw new Error("wb.notExistedMethod() was invoked");
+    }
+  }
+}
+EOF
+
+${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} -d . $WHITEBOX_SRC
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
+