User: starksm
Date: 02/03/08 00:12:46
Modified: src/main/org/jboss/ejb/plugins/local
BaseLocalContainerInvoker.java
Log:
Drop the use of CacheKey as its useless and having to wrap the
entity keys in a CacheKey was causing problems with the client interceptors.
Revision Changes Path
1.20 +6 -11
jboss/src/main/org/jboss/ejb/plugins/local/BaseLocalContainerInvoker.java
Index: BaseLocalContainerInvoker.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/local/BaseLocalContainerInvoker.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BaseLocalContainerInvoker.java 22 Feb 2002 04:24:56 -0000 1.19
+++ BaseLocalContainerInvoker.java 8 Mar 2002 08:12:45 -0000 1.20
@@ -48,7 +48,6 @@
import org.jboss.ejb.ContainerInvokerContainer;
import org.jboss.ejb.Interceptor;
import org.jboss.ejb.LocalContainerInvoker;
-import org.jboss.ejb.CacheKey;
import org.jboss.ejb.LocalHomeObjectFactory;
import org.jboss.deployment.DeploymentException;
import org.jboss.invocation.Invocation;
@@ -359,15 +358,13 @@
{
// The trick is simple we trick the container in believe it
// is a remove() on the instance
- Object id = new CacheKey(args[0]);
- return BaseLocalContainerInvoker.this.invoke(
- id, REMOVE_OBJECT, EMPTY_ARGS);
+ Object id = args[0];
+ return BaseLocalContainerInvoker.this.invoke(id, REMOVE_OBJECT,
EMPTY_ARGS);
}
// If not taken care of, go on and call the container
else
{
- return BaseLocalContainerInvoker.this.invokeHome(
- m, args);
+ return BaseLocalContainerInvoker.this.invokeHome(m, args);
}
}
}
@@ -375,13 +372,11 @@
class EntityProxy extends LocalProxy
implements InvocationHandler
{
- CacheKey cacheKey;
+ Object cacheKey;
EntityProxy( Object id )
{
- if (!(id instanceof CacheKey))
- id = new CacheKey( id );
- cacheKey = (CacheKey) id;
+ cacheKey = id;
}
protected String getJndiName()
@@ -391,7 +386,7 @@
protected Object getId()
{
- return cacheKey.getId();
+ return cacheKey;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
