From 3fe833456b30db08376b1004db4b09330259c9b5 Mon Sep 17 00:00:00 2001
From: Alex Snaps <alex.snaps@gmail.com>
Date: Sun, 25 Sep 2011 12:38:50 -0700
Subject: [PATCH] Check whether lock is null before logging, as it will
 probably be

---
 .../strategy/AbstractReadWriteEhcacheAccessStrategy.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java
index da9d7b1e51..9414f5c912 100644
--- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java
+++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java
@@ -179,7 +179,7 @@ abstract class AbstractReadWriteEhcacheAccessStrategy<T extends EhcacheTransacti
      * Handle the timeout of a previous lock mapped to this key
      */
     protected void handleLockExpiry(Object key, Lockable lock) {
-        LOG.softLockedCacheExpired( region.getName(), key, lock.toString() );
+        LOG.softLockedCacheExpired( region.getName(), key, lock == null ? "(null)" : lock.toString() );
 
         long ts = region.nextTimestamp() + region.getTimeout();
         // create new lock that times out immediately