*** old/src/share/vm/prims/methodHandles.cpp	Thu Mar 24 15:05:14 2016
--- new/src/share/vm/prims/methodHandles.cpp	Thu Mar 24 15:05:14 2016

*** 1195,1208 ****
--- 1195,1208 ----
      int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
      if (!MethodHandles::ref_kind_is_valid(ref_kind)) {
        THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "obsolete MemberName format");
      }
      if ((flags & ALL_KINDS) == IS_FIELD) {
!       THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), "field resolution failed");
!       THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), "field resolution failed");
      } else if ((flags & ALL_KINDS) == IS_METHOD ||
                 (flags & ALL_KINDS) == IS_CONSTRUCTOR) {
!       THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), "method resolution failed");
!       THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), "method resolution failed");
      } else {
        THROW_MSG_NULL(vmSymbols::java_lang_LinkageError(), "resolution failed");
      }
    }