[jBoss-Dev] CVS update: ejboss/src/java/org/jawsPersistentStorageJDBC.java

[jBoss CVS Development]

  User: sylvain 
  Date: 00/05/17 10:37:16

  Modified:    src/java/org/jaws PersistentStorageJDBC.java
  Log:
  - load() propagate exceptions
  
  - Bug fix in getPKWhereClause: in the case of CompoundKey, the where clause was 
based on every fields of the bean instead of the fields of the PK
  
  Revision  Changes    Path
  1.9       +5 -4      ejboss/src/java/org/jaws/PersistentStorageJDBC.java
  
  Index: PersistentStorageJDBC.java
  ===================================================================
  RCS file: /products/cvs/ejboss/ejboss/src/java/org/jaws/PersistentStorageJDBC.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PersistentStorageJDBC.java        2000/04/21 22:51:04     1.8
  +++ PersistentStorageJDBC.java        2000/05/17 17:37:15     1.9
  @@ -42,7 +42,7 @@
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]">Joe Shevland</a>.
    * @author  <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>.
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    * @since   Ejboss 0.9.9
    */
   
  @@ -193,7 +193,7 @@
        * @param   beanWrapper EJB wrapper holding a reference to the primary key
        *                      details required to load the EJB from the database
        */
  -    public EnterpriseBeanWrapper load(EnterpriseBeanWrapper beanWrapper)
  +    public EnterpriseBeanWrapper load(EnterpriseBeanWrapper beanWrapper) throws 
Exception
       {
           Connection  dbConnection = null;
   
  @@ -251,6 +251,7 @@
           catch (Exception e ) {
   
               Tracer.trace(e);
  +            throw e;
           }
   
           finally {
  @@ -262,8 +263,8 @@
                   Tracer.trace(se);   
               }
               
  -            return beanWrapper;
           }
  +        return beanWrapper;
       }
   
       public void update(EnterpriseBeanWrapper beanWrapper)
  @@ -816,7 +817,7 @@
   
               //MF FIXME in effect we deal with one level deep keys (Object with 
primitive type under)
   
  -            Field[] fields = beanWrapper.metaData.getBeanClass().getFields();
  +            Field[] fields = beanWrapper.metaData.getPrimaryKeyClass().getFields();
   
               return SQLSyntax.getPKWhereClause(fields);
           }