geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r110086 - /geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
Date Tue, 07 Dec 2004 05:59:48 GMT
Author: djencks
Date: Mon Dec  6 21:59:48 2004
New Revision: 110086

URL: http://svn.apache.org/viewcvs?view=rev&rev=110086
Log:
another try for spec-compliant default txtimeout
Modified:
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java?view=diff&rev=110086&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java&r1=110085&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java&r2=110086
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
Mon Dec  6 21:59:48 2004
@@ -294,7 +294,9 @@
                 //TODO should we commit the txContext to flush any leftover state???
             } else {
                 try {
-                    transactionContextManager.begin(executionContext.getXid(), executionContext.getTransactionTimeout());
+                    long transactionTimeout = executionContext.getTransactionTimeout();
+                    //translate -1 value to 0 to indicate default transaction timeout.
+                    transactionContextManager.begin(executionContext.getXid(), transactionTimeout
== -1? 0: transactionTimeout);
                 } catch (XAException e) {
                     throw new WorkCompletedException("Transaction import failed for xid "
+ executionContext.getXid(), WorkCompletedException.TX_RECREATE_FAILED).initCause(e);
                } catch (InvalidTransactionException e) {

Mime
View raw message