[infinispan-commits] Infinispan SVN: r1204 - trunk/core/src/main/java/org/infinispan/container.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-11-18 10:48:58 -0500 (Wed, 18 Nov 2009)
New Revision: 1204

Modified:
   trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
Log:
[ISPN-278] (When lazy deserialization is on, lock timeouts show MarshalledValue and not actual key) Fixed.

Modified: trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2009-11-17 15:23:21 UTC (rev 1203)
+++ trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java	2009-11-18 15:48:58 UTC (rev 1204)
@@ -33,6 +33,7 @@
 import org.infinispan.context.InvocationContext;
 import org.infinispan.factories.annotations.Inject;
 import org.infinispan.factories.annotations.Start;
+import org.infinispan.marshall.MarshalledValue;
 import org.infinispan.notifications.cachelistener.CacheNotifier;
 import org.infinispan.util.Util;
 import org.infinispan.util.concurrent.IsolationLevel;
@@ -207,6 +208,10 @@
             return true;
          } else {
             Object owner = lockManager.getOwner(key);
+            // if lock cannot be acquired, expose the key itself, not the marshalled value
+            if (key instanceof MarshalledValue) {
+               key = ((MarshalledValue) key).get();
+            }
             throw new TimeoutException("Unable to acquire lock after [" + Util.prettyPrintTime(getLockAcquisitionTimeout(ctx)) + "] on key [" + key + "] for requestor [" +
                   ctx.getLockOwner() + "]! Lock held by [" + owner + "]");
          }