JandexHelper already has ClassLoaderService arguments in methods needing CL access as a part of
HHH-8118
. However, that was only in the metamodel branch, as I wasn't aware that a few areas of 4.3 starting using it. However, I obviously can't cherry-pick that as it's a very widespread change. The path of least resistance is simply overloading JandexHelper#getDefaultValue in master w/ the metamodel changes and correct the use in EntityManagerFactoryBuilderImpl.
Strong Liu, that will be a one-time conflict headache on your next merge into metamodel, but I added a few obvious comments to describe what happened.
|