*** old/src/share/vm/classfile/javaClasses.cpp	Thu Jul  2 17:29:55 2015
--- new/src/share/vm/classfile/javaClasses.cpp	Thu Jul  2 17:29:54 2015

*** 1705,1716 ****
--- 1705,1715 ----
      // - 1 or more fillInStackTrace frames for the exception class (skipped)
      // - 0 or more <init> methods for the exception class (skipped)
      // - rest of the stack
  
      if (!skip_fillInStackTrace_check) {
!       if ((method->name() == vmSymbols::fillInStackTrace_name() ||
             method->name() == vmSymbols::fillInStackTrace0_name()) &&
!       if (method->name() == vmSymbols::fillInStackTrace_name() &&
            throwable->is_a(method->method_holder())) {
          continue;
        }
        else {
          skip_fillInStackTrace_check = true; // gone past them all