cvs commit: jakarta-slide/src/stores/slidestore/reference JDBCDescriptorsStore.java

[msmith]

msmith      01/05/29 17:47:31

  Modified:    src/stores/slidestore/reference JDBCDescriptorsStore.java
  Log:
  In JDBCDescriptorStore, we were setting the revisionnumber in the
  permissions table to the string "null" if the revisionnumber passed
  in was null. In fact, we should be setting it to null (not a string),
  so that the SQL driver can convert it to the appropriate SQL NULL
  internally.
  This makes the JDBCDescriptorStore work again.
  
  Revision  Changes    Path
  1.17      +6 -6      
jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java
  
  Index: JDBCDescriptorsStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JDBCDescriptorsStore.java 2001/05/20 22:00:53     1.16
  +++ JDBCDescriptorsStore.java 2001/05/30 00:47:31     1.17
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 
1.16 2001/05/20 22:00:53 remm Exp $
  - * $Revision: 1.16 $
  - * $Date: 2001/05/20 22:00:53 $
  + * $Header: 
/home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 
1.17 2001/05/30 00:47:31 msmith Exp $
  + * $Revision: 1.17 $
  + * $Date: 2001/05/30 00:47:31 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
    * JDBC 1.0 and 2.0 compliant store implementation.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   
   public class JDBCDescriptorsStore
  @@ -871,7 +871,7 @@
               
               NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
               String revisionNumberStr = 
  -                (revisionNumber == null) ? "null" : revisionNumber.toString();
  +                (revisionNumber == null) ? null : revisionNumber.toString();
               
               statement = connection.prepareStatement
                   ("insert into permissions values(?,?,?,?,?,?)");
  @@ -905,7 +905,7 @@
           try {
               NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
               String revisionNumberStr = 
  -                (revisionNumber == null) ? "null" : revisionNumber.toString();
  +                (revisionNumber == null) ? null : revisionNumber.toString();
   
               statement = connection.prepareStatement
                   ("delete from permissions where object= ? and revisionnumber = ? 
and subject = ? and action = ?");