remm 01/05/08 15:28:55
Modified: src/stores/slidestore/file
FileDescriptorsStoreNoVersioning.java
src/stores/slidestore/reference JDBCDescriptorsStore.java
Log:
- The permissions were not correctly removed in both the JDBC store and in the
extremely experimental file store.
Patch submitted by Dirk Verbeeck <dirk.verbeeck at the-ecorp.com>
Revision Changes Path
1.4 +5 -5
jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java
Index: FileDescriptorsStoreNoVersioning.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileDescriptorsStoreNoVersioning.java 2001/01/20 20:08:28 1.3
+++ FileDescriptorsStoreNoVersioning.java 2001/05/08 22:28:46 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v
1.3 2001/01/20 20:08:28 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/01/20 20:08:28 $
+ * $Header:
/home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v
1.4 2001/05/08 22:28:46 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/05/08 22:28:46 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Filesystem implementation of Store.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class FileDescriptorsStoreNoVersioning extends AbstractSimpleService
implements RevisionDescriptorsStore, RevisionDescriptorStore,
@@ -538,7 +538,7 @@
while (oldPermissions.hasMoreElements()) {
NodePermission currentPermission =
(NodePermission) oldPermissions.nextElement();
- if (currentPermission != permission) {
+ if (!currentPermission.equals(permission)) {
printer.println(currentPermission.getSubjectUri());
printer.println(currentPermission.getActionUri());
printer.println(currentPermission.isInheritable());
1.13 +6 -12
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JDBCDescriptorsStore.java 2001/05/04 04:23:05 1.12
+++ JDBCDescriptorsStore.java 2001/05/08 22:28:52 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v
1.12 2001/05/04 04:23:05 msmith Exp $
- * $Revision: 1.12 $
- * $Date: 2001/05/04 04:23:05 $
+ * $Header:
/home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v
1.13 2001/05/08 22:28:52 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/05/08 22:28:52 $
*
* ====================================================================
*
@@ -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.12 $
+ * @version $Revision: 1.13 $
*/
public class JDBCDescriptorsStore
@@ -876,17 +876,11 @@
PreparedStatement statement = null;
try {
- int inheritable = 0;
- if (permission.isInheritable()) {
- inheritable = 1;
- }
-
- statement = connection.prepareStatement(
- "delete from permissions where object= ? and subject = ? and
action = ? and inheritable = ?");
+ statement = connection.prepareStatement
+ ("delete from permissions where object= ? and subject = ? and
action = ?");
statement.setString(1,permission.getObjectUri());
statement.setString(2, permission.getSubjectUri());
statement.setString(3, permission.getActionUri());
- statement.setInt(4, inheritable);
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
