svn commit: r686834 - in /ode/trunk: dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java

[mriou]

Author: mriou
Date: Mon Aug 18 10:49:51 2008
New Revision: 686834

URL: http://svn.apache.org/viewvc?rev=686834&view=rev
Log:
Merge from 1.x, preparation for Hibernate 3.3 upgrade and additional tx logging.

Modified:
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
    
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java?rev=686834&r1=686833&r2=686834&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
 Mon Aug 18 10:49:51 2008
@@ -21,6 +21,7 @@
 import java.util.Properties;
 
 import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
 
 import org.hibernate.HibernateException;
 import org.hibernate.transaction.TransactionManagerLookup;
@@ -44,4 +45,8 @@
        public String getUserTransactionName() {
                return null;
        }
+
+    public Object getTransactionIdentifier(Transaction transaction) {
+        return transaction;
+    }
 }

Modified: 
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java?rev=686834&r1=686833&r2=686834&view=diff
==============================================================================
--- 
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
 (original)
+++ 
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
 Mon Aug 18 10:49:51 2008
@@ -137,6 +137,7 @@
 
     public <T> T execTransaction(Callable<T> transaction) throws Exception, 
ContextException {
         try {
+            if (__log.isDebugEnabled()) __log.debug("Beginning a new 
transaction");
             _txm.begin();
         } catch (Exception ex) {
             String errmsg = "Internal Error, could not begin transaction.";
@@ -150,10 +151,13 @@
         } catch (Exception ex) {
             throw ex;
         } finally {
-            if (success)
+            if (success) {
+                if (__log.isDebugEnabled()) __log.debug("Commiting...");
                 _txm.commit();
-            else
+            } else {
+                if (__log.isDebugEnabled()) __log.debug("Rollbacking...");
                 _txm.rollback();
+            }
         }
     }