[Jboss-svn-commits] JBL Code SVN: r1443 - in qa/forge/portal-extensions: forge-service/src/java/org/jboss/forge/service shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-10-24 15:51:10 -0400 (Mon, 24 Oct 2005)
New Revision: 1443

Modified:
   qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
   qa/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java
Log:
MERGED: -r 1436:1442 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa.  More 1.0.5 patches.


Modified: qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
===================================================================
--- qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-10-24 18:49:24 UTC (rev 1442)
+++ qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-10-24 19:51:10 UTC (rev 1443)
@@ -42,7 +42,7 @@
 			fm.update();
 			
 			// Avoiding WARN.
-			timer.cancel(); //? -- Maybe this caused the TX exception.
+			//timer.cancel(); //? -- Maybe this caused the TX exception.
 			
 			// Scheduling next timer to timeout after the amount of time that
 			// is set in forgeManagement.

Modified: qa/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java
===================================================================
--- qa/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java	2005-10-24 18:49:24 UTC (rev 1442)
+++ qa/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java	2005-10-24 19:51:10 UTC (rev 1443)
@@ -37,7 +37,7 @@
 			ssi.update();
 			
 			// Avoiding WARN.
-			timer.cancel();
+			// timer.cancel();
 			
 			scheduleTimer(ssi.getTimerInterval());
 		} catch (MalformedObjectNameException e) {