User: fleury
Date: 00/10/17 14:59:43
Modified: src/main/org/jboss/ejb/plugins
EntityInstanceInterceptor.java
Log:
cosmetics
Revision Changes Path
1.18 +6 -6
jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
Index: EntityInstanceInterceptor.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EntityInstanceInterceptor.java 2000/10/16 23:32:26 1.17
+++ EntityInstanceInterceptor.java 2000/10/17 21:59:43 1.18
@@ -43,7 +43,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
-* @version $Revision: 1.17 $
+* @version $Revision: 1.18 $
*/
public class EntityInstanceInterceptor
extends AbstractInterceptor
@@ -135,7 +135,7 @@
{
// Possible deadlock
Transaction tx = ctx.getTransaction();
- Logger.log("LOCKING-WAITING for id "+ctx.getId()+" ctx.hash
"+ctx.hashCode()+" tx:"+((tx == null) ? "null" : tx.toString()));
+ Logger.log("LOCKING-WAITING (TRANSACTION) for id "+ctx.getId()+"
ctx.hash "+ctx.hashCode()+" tx:"+((tx == null) ? "null" : tx.toString()));
try{ctx.wait(5000);}
catch (InterruptedException ie) {}
@@ -161,7 +161,7 @@
synchronized (ctx)
{
// Possible deadlock
- Logger.log("LOCKING-WAITING for id "+ctx.getId()+"
ctx.hash "+ctx.hashCode());
+ Logger.log("LOCKING-WAITING (CTX) for id
"+ctx.getId()+" ctx.hash "+ctx.hashCode());
try{ctx.wait(5000);}
catch (InterruptedException ie) {}
@@ -195,21 +195,21 @@
{
// Discard instance
// EJB 1.1 spec 12.3.1
- ((EntityContainer)getContainer()).getInstanceCache().remove(key);
+ cache.remove(key);
throw e;
} catch (RuntimeException e)
{
// Discard instance
// EJB 1.1 spec 12.3.1
- ((EntityContainer)getContainer()).getInstanceCache().remove(key);
+ cache.remove(key);
throw e;
} catch (Error e)
{
// Discard instance
// EJB 1.1 spec 12.3.1
- ((EntityContainer)getContainer()).getInstanceCache().remove(key);
+ cache.remove(key);
throw e;
} finally
