The same test also fails without your change (when running with Java7).
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
I cherry-picked your changes and added an upgrade of javassist as well. I locally resolved the merge error that i had with your change. The branch is https://github.com/scottmarlow/hibernate-orm/tree/4.1_javassist_javaverify but am getting a test failure in org.hibernate.test.bytecode.javassist.ReflectionOptimizerTest(http://pastie.org/5494511).
The same test also fails without your change (when running with Java7).