User: starksm
Date: 02/03/08 00:12:47
Modified: src/main/org/jboss/proxy/ejb EntityInterceptor.java
HomeInterceptor.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.3 +3 -4 jboss/src/main/org/jboss/proxy/ejb/EntityInterceptor.java
Index: EntityInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/proxy/ejb/EntityInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntityInterceptor.java 8 Mar 2002 01:26:55 -0000 1.2
+++ EntityInterceptor.java 8 Mar 2002 08:12:47 -0000 1.3
@@ -14,7 +14,6 @@
import javax.ejb.EJBHome;
import javax.naming.InitialContext;
-import org.jboss.ejb.CacheKey;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.InvocationContext;
import org.jboss.invocation.Invoker;
@@ -23,7 +22,7 @@
/**
* An EJB entity bean proxy class.
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>2001/11/19: marcf</b>
* <ol>
@@ -88,12 +87,12 @@
else if (m.equals(GET_HANDLE))
{
String jndiName = (String) ctx.getValue(JNDI_NAME);
- Object id = ((CacheKey)ctx.getCacheId()).getId();
+ Object id = ctx.getCacheId();
return new EntityHandleImpl(jndiName, id);
}
else if (m.equals(GET_PRIMARY_KEY))
{
- return ((CacheKey)ctx.getCacheId()).getId();
+ return ctx.getCacheId();
}
else if (m.equals(GET_EJB_HOME))
{
1.2 +2 -3 jboss/src/main/org/jboss/proxy/ejb/HomeInterceptor.java
Index: HomeInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/proxy/ejb/HomeInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HomeInterceptor.java 7 Mar 2002 18:25:52 -0000 1.1
+++ HomeInterceptor.java 8 Mar 2002 08:12:47 -0000 1.2
@@ -21,7 +21,6 @@
import org.jboss.proxy.ejb.handle.HomeHandleImpl;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.InvocationContext;
-import org.jboss.ejb.CacheKey;
/*
import java.io.IOException;
@@ -44,7 +43,7 @@
* The client-side proxy for an EJB Home object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
-* @version $Revision: 1.1 $
+* @version $Revision: 1.2 $
*
* <p><b>2001/11/21: marcf</b>
* <ol>
@@ -167,7 +166,7 @@
// The trick is simple we trick the container in believe it
// is a remove() on the instance
- Object id = new CacheKey(invocation.getArguments()[0]);
+ Object id = invocation.getArguments()[0];
// Just override the Invocation going out
invocation.setId(id);
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
