Author: mircea.markus Date: 2008-02-20 05:01:36 -0500 (Wed, 20 Feb 2008) New Revision: 5360 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java Log: removed unused code Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 09:52:11 UTC (rev 5359) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 10:01:36 UTC (rev 5360) @@ -82,18 +82,6 @@ { return super.invoke(ctx); } -// catch (LockingException le) -// { -// if (trace) log.trace("Locking exception occured, cleaning up locks.", le); -// releaseLocks(ctx); -// throw le; -// } -// catch (TimeoutException te) -// { -// if (trace) log.trace("Locking exception occured, cleaning up locks.", te); -// releaseLocks(ctx); -// throw te; -// } finally { // This is functionality from the UnlockInterceptor: @@ -133,36 +121,7 @@ } } - /** - * If an issue appears while acquiring a lock (e.g. timeout exception, upgrade exception) then acquire - * release all acquired locks before throwing it. - */ - private void releaseLocks(InvocationContext ctx) - { - // This should not be necessary - the finally block above will take care of non-tx calls that need cleaning up, even - // if there is an exception. - // For tx calls, the TxManager will call a rollback to free up resources. -- MS -// GlobalTransaction gtx = ctx.getGlobalTransaction(); -// if (trace) log.trace("Releasing existing locks. Global tx?" + gtx); -// if (gtx != null) -// { -// TransactionEntry te = cache.getTransactionTable().get(gtx); -// te.releaseAllLocksFIFO(gtx); -// } -// else -// { -// Thread currentThread = Thread.currentThread(); -// List<NodeLock> locks = ctx.getInvocationLocksAcquired(); -// if (locks != null) -// for (NodeLock aLock : locks) -// { -// aLock.release(currentThread); -// } -// } - } - - protected Object handlePutDataMethod(InvocationContext ctx, GlobalTransaction tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable { return handlePutMethod(ctx, fqn);