jford 2004/05/18 12:58:25
Modified: src/java/org/apache/jetspeed/services/security/turbine
TurbinePermissionManagement.java
TurbineRoleManagement.java
TurbineAuthentication.java
TurbineGroupManagement.java
Log:
Only call commit if autocommit is set to false
PR: JS1-472
Revision Changes Path
1.11 +6 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java
Index: TurbinePermissionManagement.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbinePermissionManagement.java 23 Feb 2004 03:54:49 -0000 1.10
+++ TurbinePermissionManagement.java 18 May 2004 19:58:25 -0000 1.11
@@ -293,8 +293,11 @@
TurbineRolePermissionPeer.doDelete(critRolePerm, conn);
}
TurbinePermissionPeer.doDelete(criteria, conn);
-
- conn.commit();
+
+ if(!conn.getAutoCommit())
+ {
+ conn.commit();
+ }
if (cachingEnable)
{
1.15 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java
Index: TurbineRoleManagement.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineRoleManagement.java 23 Feb 2004 03:54:49 -0000 1.14
+++ TurbineRoleManagement.java 18 May 2004 19:58:25 -0000 1.15
@@ -333,7 +333,10 @@
TurbineRolePeer.doDelete(criteria, conn);
PsmlManager.removeRoleDocuments(role);
- conn.commit();
+ if(!conn.getAutoCommit())
+ {
+ conn.commit();
+ }
if (cachingEnable)
{
1.10 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java
Index: TurbineAuthentication.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineAuthentication.java 23 Feb 2004 03:54:49 -0000 1.9
+++ TurbineAuthentication.java 18 May 2004 19:58:25 -0000 1.10
@@ -248,7 +248,7 @@
anonymousUser = serviceConf.getString(CONFIG_ANONYMOUS_USER, anonymousUser);
cachingEnable = serviceConf.getBoolean( CACHING_ENABLE, cachingEnable );
- expirationPeriod = serviceConf.getInt(
this.CONFIG_PASSWORD_EXPIRATION_PERIOD, 0 );
+ expirationPeriod = serviceConf.getInt( CONFIG_PASSWORD_EXPIRATION_PERIOD, 0
);
this.runDataService =
(JetspeedRunDataService)TurbineServices.getInstance()
1.12 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java
Index: TurbineGroupManagement.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbineGroupManagement.java 23 Feb 2004 03:54:49 -0000 1.11
+++ TurbineGroupManagement.java 18 May 2004 19:58:25 -0000 1.12
@@ -307,7 +307,10 @@
TurbineGroupPeer.doDelete(criteria, conn);
PsmlManager.removeGroupDocuments(group);
- conn.commit();
+ if(!conn.getAutoCommit())
+ {
+ conn.commit();
+ }
}
catch(Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
