Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: f2120010ac4621a5e332f6cd0aec3d2d46fdc1f6 https://github.com/hibernate/hibernate-orm/commit/f2120010ac4621a5e332f6c... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateUtil.java Log Message: ----------- HHH-6576 NPE in Ehcache HibernateEhcacheUtils Conflicts: hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java