You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ms...@apache.org on 2001/06/20 08:23:30 UTC
cvs commit: jakarta-slide/src/stores/slidestore/reference JDBCDescriptorsStore.java
msmith 01/06/19 23:23:29
Modified: src/stores/slidestore/reference JDBCDescriptorsStore.java
Log:
Fix SQL when deleting permissions when revisionNumber is null. Patch
suggested by "Alexander Demidovich" <al...@softhome.net>
Revision Changes Path
1.18 +16 -11 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JDBCDescriptorsStore.java 2001/05/30 00:47:31 1.17
+++ JDBCDescriptorsStore.java 2001/06/20 06:23:26 1.18
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.18 2001/06/20 06:23:26 msmith Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/06/20 06:23:26 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* JDBC 1.0 and 2.0 compliant store implementation.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class JDBCDescriptorsStore
@@ -904,15 +904,20 @@
try {
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
- String revisionNumberStr =
- (revisionNumber == null) ? null : revisionNumber.toString();
+ if(revisionNumber != null) {
+ statement = connection.prepareStatement
+ ("delete from permissions where object= ? and subject = ? and action = ? and revisionnumber = ? ");
+ statement.setString(4, revisionNumber.toString());
+ }
+ else {
+ statement = connection.prepareStatement
+ ("delete from permissions where object = ? and subject = ? and action = ? and revisionnumber is NULL");
+ }
- statement = connection.prepareStatement
- ("delete from permissions where object= ? and revisionnumber = ? and subject = ? and action = ?");
statement.setString(1, permission.getObjectUri());
- statement.setString(2, revisionNumberStr);
- statement.setString(3, permission.getSubjectUri());
- statement.setString(4, permission.getActionUri());
+ statement.setString(2, permission.getSubjectUri());
+ statement.setString(3, permission.getActionUri());
+
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);