[C2.0] Patches for DatabaseAuthenticatorAction & build.xml

[Philipp Schmidt]

Hi all,

Here is patch for DatabaseAuthenticatorAction when autocommit=true
(default value in the cocoon.xconf ) .
Please check why we need transactions in the DatabaseAuthenticatorAction
anyway.
Another Patch for build.xml which fixes a problem with the compilation
of SendmailAction due to the Oracle jdbc driver.


Philipp


Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-cocoon2/build.xml,v
retrieving revision 1.8.2.29
diff -u -r1.8.2.29 build.xml
--- build.xml   2001/08/16 06:10:09     1.8.2.29
+++ build.xml   2001/08/24 13:03:57
@@ -263,7 +263,7 @@
     <available property="xpath.present" classname="org.apache.xpath.XPathAPI">
       <classpath refid="classpath"/>
     </available>
-    <available property="ora.driver.present" classname="oracle.sql.BLOB">
+    <available property="ora.driver.present" classname="oracle.jdbc.OracleResultSet">
       <classpath refid="classpath"/>
     </available>
     <available property="mail.present" classname="javax.mail.Session">


Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file: 
/home/cvspublic/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
retrieving revision 1.3.2.8
diff -u -r1.3.2.8 DatabaseAuthenticatorAction.java
--- DatabaseAuthenticatorAction.java    2001/08/22 12:08:20     1.3.2.8
+++ DatabaseAuthenticatorAction.java    2001/08/24 09:21:05
@@ -124,19 +124,23 @@
 
                 HashMap actionMap = this.propagateParameters (conf, rs,
                         session);
-
-                conn.commit();
+               if(!conn.getAutoCommit()) {
+                   conn.commit();
+               }
                 return Collections.unmodifiableMap (actionMap);
             }
-
-            conn.rollback();
+           if(!conn.getAutoCommit()) {
+               conn.rollback();
+           }
 
             req.setAttribute("message", "The username or password were incorrect, 
please check your CAPS LOCK key and try again.");
             getLogger ().debug ("DBAUTH: no results for query");
         } catch (Exception e) {
             if (conn != null) {
                 try {
-                    conn.rollback();
+                   if(!conn.getAutoCommit()) {
+                       conn.rollback();
+                   }
                 } catch (Exception se) {/* ignore */}
             }
             getLogger().debug ("exception: ", e);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]