ExceptionInInitializerError for an enum with multiple switch statements, follow-up

proposed fix for JDK-7176515 fix the specific reported issue but a more complex test case still fails with the same exception error at runtime. See the fix for JDK-7176515 which contains a commented version of the test case still failing. We need to do more research in order to provide a complete solution, if possible.