unico 2004/09/21 09:04:57
Modified: src/stores/org/apache/slide/store/impl/rdbms Tag:
SLIDE_2_1_RELEASE_BRANCH StandardRDBMSAdapter.java
Log:
fix NPE when revision is null and execute the correct delete stament
Revision Changes Path
No revision
No revision
1.32.2.1 +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.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- StandardRDBMSAdapter.java 4 Aug 2004 11:45:59 -0000 1.32
+++ StandardRDBMSAdapter.java 21 Sep 2004 16:04:56 -0000 1.32.2.1
@@ -577,11 +577,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]
