[Mulgara-svn] r1119 - trunk/src/jar/resolver/java/org/mulgara/resolver

[ronald at mulgara.org]

Author: ronald
Date: 2008-08-04 01:26:02 -0700 (Mon, 04 Aug 2008)
New Revision: 1119

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
Log:
Applied formatting fixes from r1104 .


Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java	2008-08-01 05:15:37 UTC (rev 1118)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java	2008-08-04 08:26:02 UTC (rev 1119)
@@ -363,8 +363,7 @@
       this.txnDeadline = txnDeadline;
       this.idleTimeout = idleTimeout;
 
-      if (lastActive <= 0)
-        lastActive = System.currentTimeMillis();
+      if (lastActive <= 0) lastActive = System.currentTimeMillis();
       long nextWakeup = Math.min(txnDeadline, lastActive + idleTimeout);
 
       if (logger.isDebugEnabled()) {
@@ -383,12 +382,12 @@
       long now = System.currentTimeMillis();
 
       synchronized (getMutexLock()) {
-        if (timeoutTasks.remove(transaction) == null)
-          return;       // looks like we got cleaned up
+        if (timeoutTasks.remove(transaction) == null) return;  // looks like we got cleaned up
 
         if (now < txnDeadline && ((lastActive <= 0) || (now < lastActive + idleTimeout))) {
-          if (logger.isDebugEnabled())
+          if (logger.isDebugEnabled()) {
             logger.debug("Transaction still active: " + lastActive + " time: " + now + " idle-timeout: " + idleTimeout + " - rescheduling timer");
+          }
 
           timeoutTasks.put(transaction, new XAReaper(transaction, txnDeadline, idleTimeout, lastActive));
           return;