[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc JDBCCommand.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/09/26 11:58:34

  Modified:    src/main/org/jboss/ejb/plugins/jaws/jdbc JDBCCommand.java
  Log:
  new adds for the proper management of Tx and cache
  
  Revision  Changes    Path
  1.14      +7 -6      jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommand.java
  
  Index: JDBCCommand.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommand.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JDBCCommand.java  2000/09/13 22:44:07     1.13
  +++ JDBCCommand.java  2000/09/26 18:58:34     1.14
  @@ -31,6 +31,7 @@
   import java.sql.Types;
   
   import java.rmi.RemoteException;
  +import java.rmi.MarshalledObject;
   
   import javax.ejb.EJBObject;
   import javax.ejb.Handle;
  @@ -51,7 +52,7 @@
    * utility methods that database commands may need to call.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public abstract class JDBCCommand
   {
  @@ -296,7 +297,7 @@
                 try {
                     ObjectOutputStream oos = new ObjectOutputStream(baos);
   
  -                  oos.writeObject(value);
  +                  oos.writeObject(new MarshalledObject(value));
   
                     oos.close();
   
  @@ -376,20 +377,20 @@
               }
           }
   
  -        /*result = rs.getObject(idx);
  +        result = rs.getObject(idx);
           if(result == null)
               return null;
   
           if(destination.isAssignableFrom(result.getClass()))
  -            return result;*/
  +            return result;
   // DEBUG        else System.out.println("Got a "+result.getClass().getName()+": 
'"+result+"' while looking for a "+destination.getName());
   
           // Also we should detect the EJB references here
   
           // Get the underlying byte[]
   
  -        //byte[] bytes = result instanceof byte[] ? (byte[])result : 
rs.getBytes(idx);
  -             byte[] bytes = rs.getBytes(idx);
  +        byte[] bytes = result instanceof byte[] ? (byte[])result : rs.getBytes(idx);
  +             //byte[] bytes = rs.getBytes(idx);
   
           if( bytes == null ) {
               result = null;