User: fleury
Date: 00/08/24 19:07:29
Modified: src/main/org/jboss/ejb/plugins/jrmp/server
JRMPContainerInvoker.java
Log:
No more FastKey and also a big fix in the Tx behaviour
Revision Changes Path
1.20 +12 -9
jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java
Index: JRMPContainerInvoker.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JRMPContainerInvoker.java 2000/08/18 03:27:08 1.19
+++ JRMPContainerInvoker.java 2000/08/25 02:07:28 1.20
@@ -40,7 +40,6 @@
import org.jboss.ejb.ContainerInvokerContainer;
import org.jboss.ejb.Interceptor;
import org.jboss.ejb.ContainerInvoker;
-import org.jboss.util.FastKey;
import org.jboss.ejb.plugins.jrmp.interfaces.RemoteMethodInvocation;
import org.jboss.ejb.plugins.jrmp.interfaces.HomeProxy;
import org.jboss.ejb.plugins.jrmp.interfaces.HomeHandleImpl;
@@ -72,7 +71,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien
Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public abstract class JRMPContainerInvoker
extends RemoteServer
@@ -119,7 +118,7 @@
public abstract EJBObject getStatefulSessionEJBObject(Object id);
- public abstract EJBObject getEntityEJBObject(FastKey id);
+ public abstract EJBObject getEntityEJBObject(Object id);
public abstract Collection getEntityCollection(Collection ids);
@@ -139,8 +138,10 @@
//DEBUG Logger.log("The home transaction is "+tx);
//Logger.log(container.getTransactionManager().toString());
- if (tx == null)
- tx = container.getTransactionManager().getTransaction();
+ // MF FIXME: the following don't belong here, the transaction is
+ // passed by the call, not implicitely...
+ //if (tx == null)
+ // tx = container.getTransactionManager().getTransaction();
return new MarshalledObject(invokeHome(rmi.getMethod(),
rmi.getArguments(), tx,
rmi.getPrincipal(), rmi.getCredential() ));
@@ -166,8 +167,8 @@
rmi.setMethodMap(beanMethodInvokerMap);
Transaction tx = rmi.getTransaction();
// MF FIXME: there should be no implicit thread passing of the transaction
- if (tx == null)
- tx = container.getTransactionManager().getTransaction();
+ //if (tx == null)
+ // tx = container.getTransactionManager().getTransaction();
Object id = rmi.getId();
Method m = rmi.getMethod();
@@ -185,9 +186,11 @@
Principal identity, Object credential)
throws Exception
{
- Logger.log("JRMPCI:invokeHome "+m);
+ Logger.log("JRMPCI:invokeHome "+m.getName());
+ if (tx != null) Logger.log("Tx is "+tx.toString());
+ else Logger.log("Tx is null");
return container.invokeHome(new MethodInvocation(null , m, args, tx,
- identity, credential));
+ identity, credential));
}
public Object invoke(Object id, Method m, Object[] args, Transaction tx,
