[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jrmp/server JRMPContainerInvoker.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/06/21 04:51:35

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  Added some stateful container files
  
  Revision  Changes    Path
  1.8       +12 -3     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JRMPContainerInvoker.java 2000/06/16 13:10:27     1.7
  +++ JRMPContainerInvoker.java 2000/06/21 11:51:34     1.8
  @@ -62,7 +62,7 @@
    *      
    *      @see <related>
    *      @author Rickard �berg ([EMAIL PROTECTED])
  - *      @version $Revision: 1.7 $
  + *      @version $Revision: 1.8 $
    */
   public abstract class JRMPContainerInvoker
      extends RemoteServer
  @@ -122,7 +122,12 @@
              RemoteMethodInvocation rmi = (RemoteMethodInvocation)mimo.get();
              rmi.setMethodMap(homeMethodInvokerMap);
                
  -                     return invokeHome(rmi.getMethod(), rmi.getArguments(), 
rmi.getTransaction(), rmi.getPrincipal());
  +                     Transaction tx = rmi.getTransaction();
  +                     System.out.println(container.getTransactionManager());
  +                     if (tx == null)
  +                             tx = 
container.getTransactionManager().getTransaction();
  +             
  +                     return invokeHome(rmi.getMethod(), rmi.getArguments(), tx, 
rmi.getPrincipal());
         } catch (Exception e)
         {
                e.printStackTrace();
  @@ -144,7 +149,11 @@
            RemoteMethodInvocation rmi = (RemoteMethodInvocation)mimo.get();
            rmi.setMethodMap(beanMethodInvokerMap);
                        
  -         return invoke(rmi.getId(), rmi.getMethod(), rmi.getArguments(), 
rmi.getTransaction(), rmi.getPrincipal());
  +         Transaction tx = rmi.getTransaction();
  +         if (tx == null)
  +             tx = container.getTransactionManager().getTransaction();
  +                             
  +         return invoke(rmi.getId(), rmi.getMethod(), rmi.getArguments(), tx, 
rmi.getPrincipal());
         } finally
         {
            Thread.currentThread().setContextClassLoader(oldCl);