bloritsch 01/03/09 08:10:28
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon/acting Tag: xml-cocoon2
DatabaseAddAction.java DatabaseDeleteAction.java
DatabaseUpdateAction.java
Log:
Fixing autocommit code.
Revision Changes Path
No revision
No revision
1.1.2.21 +223 -512 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.1.2.12 +6 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- DatabaseAddAction.java 2001/03/08 15:37:08 1.1.2.11
+++ DatabaseAddAction.java 2001/03/09 16:10:27 1.1.2.12
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/08 15:37:08 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/09 16:10:27 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
private static final Map addStatements = new HashMap();
@@ -63,7 +63,11 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- conn.setAutoCommit(false);
+
+ if (conn.getAutoCommit() == true) {
+ conn.setAutoCommit(false);
+ }
+
PreparedStatement statement = conn.prepareStatement(query);
Iterator keys =
conf.getChild("table").getChild("keys").getChildren("key");
1.1.2.8 +5 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- DatabaseDeleteAction.java 2001/03/08 15:37:06 1.1.2.7
+++ DatabaseDeleteAction.java 2001/03/09 16:10:27 1.1.2.8
@@ -43,7 +43,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/03/08 15:37:06 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/09 16:10:27 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
@@ -64,7 +64,10 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- conn.setAutoCommit(false);
+
+ if (conn.getAutoCommit() == true) {
+ conn.setAutoCommit(false);
+ }
PreparedStatement statement = conn.prepareStatement(query);
1.1.2.12 +5 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- DatabaseUpdateAction.java 2001/03/08 15:37:04 1.1.2.11
+++ DatabaseUpdateAction.java 2001/03/09 16:10:27 1.1.2.12
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/08 15:37:04 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/09 16:10:27 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
@@ -61,7 +61,10 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- conn.setAutoCommit(false);
+
+ if (conn.getAutoCommit() == true) {
+ conn.setAutoCommit(false);
+ }
PreparedStatement statement = conn.prepareStatement(query);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
