Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 90bb7c8ddb9d7061544cdb02739b402f5de1ece6 https://github.com/hibernate/hibernate-orm/commit/90bb7c8ddb9d7061544cdb0... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-11-22 (Fri, 22 Nov 2013) Changed paths: M hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateUtil.java Log Message: ----------- HHH-8738 NPE in HibernateUtil if no default ehcache configuration Conflicts: hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java