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 oz...@apache.org on 2004/10/05 22:56:10 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms PostgresRDBMSAdapter.java CommonRDBMSAdapter.java StandardRDBMSAdapter.java
ozeigermann 2004/10/05 13:56:10
Modified: src/stores/org/apache/slide/store/impl/rdbms Tag:
SLIDE_2_1_RELEASE_BRANCH PostgresRDBMSAdapter.java
CommonRDBMSAdapter.java StandardRDBMSAdapter.java
Log:
Added additional check for null permission which was reported to be passed
when revoking rights.
Revision Changes Path
No revision
No revision
1.10.2.2 +5 -4 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/PostgresRDBMSAdapter.java
Index: PostgresRDBMSAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/PostgresRDBMSAdapter.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- PostgresRDBMSAdapter.java 8 Sep 2004 05:02:47 -0000 1.10.2.1
+++ PostgresRDBMSAdapter.java 5 Oct 2004 20:56:09 -0000 1.10.2.2
@@ -238,6 +238,7 @@
Uri uri,
NodePermission permission)
throws ServiceAccessException {
+ if (permission == null) return;
PreparedStatement statement = null;
try {
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
1.4.2.2 +4 -3 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/CommonRDBMSAdapter.java
Index: CommonRDBMSAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/CommonRDBMSAdapter.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- CommonRDBMSAdapter.java 28 Aug 2004 17:20:45 -0000 1.4.2.1
+++ CommonRDBMSAdapter.java 5 Oct 2004 20:56:09 -0000 1.4.2.2
@@ -222,6 +222,7 @@
public void revokePermission(Connection connection, Uri uri, NodePermission permission)
throws ServiceAccessException {
+ if (permission == null) return;
PreparedStatement statement = null;
try {
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
1.32.2.2 +5 -4 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.2.1
retrieving revision 1.32.2.2
diff -u -r1.32.2.1 -r1.32.2.2
--- StandardRDBMSAdapter.java 21 Sep 2004 16:04:56 -0000 1.32.2.1
+++ StandardRDBMSAdapter.java 5 Oct 2004 20:56:10 -0000 1.32.2.2
@@ -572,6 +572,7 @@
public void revokePermission(Connection connection, Uri uri, NodePermission permission)
throws ServiceAccessException {
+ if (permission == null) return;
PreparedStatement statement = null;
try {
NodeRevisionNumber revisionNumber = permission.getRevisionNumber();
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org