[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces EntityProxy.javaStatefulSessionProxy.java Statele

[jBoss CVS Development]

  User: oberg   
  Date: 00/08/16 11:09:48

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/interfaces
                        EntityProxy.java StatefulSessionProxy.java
                        StatelessSessionProxy.java
  Log:
  Fixed MarshalledObject classcast in proxies
  
  Revision  Changes    Path
  1.14      +2 -2      
jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/EntityProxy.java
  
  Index: EntityProxy.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/EntityProxy.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- EntityProxy.java  2000/08/16 06:44:44     1.13
  +++ EntityProxy.java  2000/08/16 18:09:47     1.14
  @@ -20,7 +20,7 @@
    *      @see <related>
    *      @author Rickard �berg ([EMAIL PROTECTED])
    *           @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *      @version $Revision: 1.13 $
  + *      @version $Revision: 1.14 $
    */
   public class EntityProxy
      extends GenericProxy
  @@ -145,7 +145,7 @@
                 rmi.setCredential( getCredential() );
                         
                         // Invoke on the remote server, enforce marshalling
  -              return container.invoke(new MarshalledObject(rmi));
  +              return container.invoke(new MarshalledObject(rmi)).get();
              }
         }
      }
  
  
  
  1.14      +2 -2      
jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/StatefulSessionProxy.java
  
  Index: StatefulSessionProxy.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/StatefulSessionProxy.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StatefulSessionProxy.java 2000/08/16 06:44:45     1.13
  +++ StatefulSessionProxy.java 2000/08/16 18:09:47     1.14
  @@ -21,7 +21,7 @@
    *      @see <related>
    *      @author Rickard �berg ([EMAIL PROTECTED])
    *           @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *      @version $Revision: 1.13 $
  + *      @version $Revision: 1.14 $
    */
   public class StatefulSessionProxy
      extends GenericProxy
  @@ -162,7 +162,7 @@
                rmi.setCredential( getCredential() );
             
             // Invoke on the remote server, enforce marshalling
  -             return container.invoke(new MarshalledObject(rmi));
  +             return container.invoke(new MarshalledObject(rmi)).get();
             }
         }
      }
  
  
  
  1.10      +2 -2      
jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/StatelessSessionProxy.java
  
  Index: StatelessSessionProxy.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/interfaces/StatelessSessionProxy.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StatelessSessionProxy.java        2000/08/16 06:44:46     1.9
  +++ StatelessSessionProxy.java        2000/08/16 18:09:47     1.10
  @@ -21,7 +21,7 @@
   *      @see <related>
   *      @author Rickard �berg ([EMAIL PROTECTED])
   *       @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  -*      @version $Revision: 1.9 $
  +*      @version $Revision: 1.10 $
   */
   public class StatelessSessionProxy
      extends GenericProxy
  @@ -161,7 +161,7 @@
                                rmi.setCredential( getCredential() );
                                
                                // Invoke on the remote server, enforce marshalling
  -                             return container.invoke(new MarshalledObject(rmi));
  +                             return container.invoke(new 
MarshalledObject(rmi)).get();
                        }
                }
        }