HHH-8738 NPE in HibernateUtil if no default ehcache configuration

This commit is contained in:
Brett Meyer 2013-11-22 14:19:36 -05:00
parent 6f25adcfd2
commit 11033040e6

View File

@ -74,7 +74,8 @@ public static Configuration loadAndCorrectConfiguration(URL url) {
return null;
}
if ( config.getDefaultCacheConfiguration().isTerracottaClustered() ) {
if ( config.getDefaultCacheConfiguration() != null
&& config.getDefaultCacheConfiguration().isTerracottaClustered() ) {
if ( ValueMode.IDENTITY
.equals( config.getDefaultCacheConfiguration().getTerracottaConfiguration().getValueMode() ) ) {
LOG.incompatibleCacheValueMode();