Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8738 NPE in HibernateUtil if no default ehcache configuration 

Conflicts:
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java
This commit is contained in:
Brett Meyer 2013-11-22 14:21:48 -05:00
parent 492ea5d2a5
commit 90bb7c8ddb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateUtil.java vendored
View File

@ -67,7 +67,8 @@ public final class HibernateUtil {
return null; return null;
} }
if ( config.getDefaultCacheConfiguration().isTerracottaClustered() ) { if ( config.getDefaultCacheConfiguration() != null
&& config.getDefaultCacheConfiguration().isTerracottaClustered() ) {
if ( ValueMode.IDENTITY if ( ValueMode.IDENTITY
.equals( config.getDefaultCacheConfiguration().getTerracottaConfiguration().getValueMode() ) ) { .equals( config.getDefaultCacheConfiguration().getTerracottaConfiguration().getValueMode() ) ) {
LOG.incompatibleCacheValueMode(); LOG.incompatibleCacheValueMode();