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 di...@apache.org on 2001/10/07 21:32:04 UTC
cvs commit: jakarta-slide/src/stores/slidestore/reference JDBCDescriptorsStore.java
dirkv 01/10/07 12:32:04
Modified: src/stores/slidestore/reference JDBCDescriptorsStore.java
Log:
FIX 3930: Mysql, Temporary row in permissions table not removed after initialization
Because the quote around "ACTION" the condition never met, so no
row got deleted when revoke was called.
Revision Changes Path
1.28 +8 -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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JDBCDescriptorsStore.java 2001/09/22 12:53:12 1.27
+++ JDBCDescriptorsStore.java 2001/10/07 19:32:04 1.28
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.27 2001/09/22 12:53:12 dirkv Exp $
- * $Revision: 1.27 $
- * $Date: 2001/09/22 12:53:12 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.28 2001/10/07 19:32:04 dirkv Exp $
+ * $Revision: 1.28 $
+ * $Date: 2001/10/07 19:32:04 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public class JDBCDescriptorsStore
@@ -937,18 +937,20 @@
public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
+ /* Warning changes to this method should also be done to CloudscapeDescriptorsStore */
+
PreparedStatement statement = null;
try {
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
if(revisionNumber != null) {
statement = connection.prepareStatement
- ("delete from permissions where object= ? and subject = ? and \"ACTION\" = ? and revisionnumber = ? ");
+ ("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");
+ ("delete from permissions where object = ? and subject = ? and action = ? and revisionnumber is NULL");
}
statement.setString(1, permission.getObjectUri());