unico 2004/09/21 09:09:10
Modified: src/stores/org/apache/slide/store/impl/rdbms
StandardRDBMSAdapter.java
Log:
fix NPE when revision is null and execute the correct delete stament
Revision Changes Path
1.35 +5 -6
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java
Index: StandardRDBMSAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- StandardRDBMSAdapter.java 20 Sep 2004 22:41:32 -0000 1.34
+++ StandardRDBMSAdapter.java 21 Sep 2004 16:09:10 -0000 1.35
@@ -583,11 +583,10 @@
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
statement =
connection.prepareStatement(
- "delete PERMISSIONS from PERMISSIONS, URI ou, URI su, URI au
where OBJECT_ID = ou.URI_ID and ou.URI_STRING = ? and SUBJECT_ID = su.URI_ID and
su.URI_STRING = ? and ACTION_ID = au.URI_ID and au.URI_STRING = ? and VERSION_NO = ?");
+ "delete PERMISSIONS from PERMISSIONS, URI ou, URI su, URI
au where OBJECT_ID = ou.URI_ID and ou.URI_STRING = ? and SUBJECT_ID = su.URI_ID and
su.URI_STRING = ? and ACTION_ID = au.URI_ID and au.URI_STRING = ? and VERSION_NO" +
((revisionNumber == null) ? " IS NULL " : " = '" + revisionNumber.toString() + "'"));
statement.setString(1, permission.getObjectUri());
statement.setString(2, permission.getSubjectUri());
statement.setString(3, permission.getActionUri());
- statement.setString(4, revisionNumber.toString());
statement.executeUpdate();
} catch (SQLException e) {
throw createException(e, uri.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
