[jboss-cvs] JBossAS SVN: r108236 - in branches/JBPAPP_4_2_0_GA_CP: testsuite/src/resources/util and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: tkobayas at redhat.com
Date: 2010-09-20 21:33:58 -0400 (Mon, 20 Sep 2010)
New Revision: 108236

Removed:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/util/test/jbas8382/
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/util/test-jbas8382-scheduler-service.xml
Modified:
   branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/varia/scheduler/ScheduleManager.java
Log:
temporary revert

Deleted: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/util/test-jbas8382-scheduler-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/util/test-jbas8382-scheduler-service.xml	2010-09-20 20:53:26 UTC (rev 108235)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/util/test-jbas8382-scheduler-service.xml	2010-09-21 01:33:58 UTC (rev 108236)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Tests of the Scheduler services
-$Id: test-default-scheduler-service.xml 81742 2008-11-27 17:07:11Z adrian at jboss.org $
--->
-
-<server>
-
-   <!-- ScheduleManager -->
-
-   <mbean code="org.jboss.varia.scheduler.example.SchedulableMBeanExample"
-      name="test:name=SchedulableMBeanExample">
-   </mbean>
-
-   <mbean code="org.jboss.varia.scheduler.ScheduleManager"
-      name="test:service=Scheduler,name=ScheduleManager">
-   </mbean>
-
-   <mbean code="org.jboss.varia.scheduler.SingleScheduleProvider"
-      name="test:service=SingleScheduleProvider">
-      <attribute name="TargetMethod">hit( NOTIFICATION, DATE, REPETITIONS, SCHEDULER_NAME, java.lang.String )</attribute>
-	  <depends optional-attribute-name="ScheduleManagerName">test:service=Scheduler,name=ScheduleManager</depends>
-	  <depends optional-attribute-name="TargetName">test:name=SchedulableMBeanExample</depends>
-      <attribute name="StartDate">NOW</attribute>
-      <attribute name="Repetitions">1</attribute>
-      <attribute name="Period">1</attribute>
-   </mbean>
-
-</server>

Modified: branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/varia/scheduler/ScheduleManager.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/varia/scheduler/ScheduleManager.java	2010-09-20 20:53:26 UTC (rev 108235)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/varia/scheduler/ScheduleManager.java	2010-09-21 01:33:58 UTC (rev 108236)
@@ -687,8 +687,8 @@
       public int mNotificationID;
       public ObjectName mProvider;
       public ObjectName mTarget;
-      public long mInitialRepetitions;
-      public long mRemainingRepetitions = 0;
+      public int mInitialRepetitions;
+      public int mRemainingRepetitions = 0;
       public Date mStartDate;
       public long mPeriod;
       public String mMethodName;
@@ -769,7 +769,7 @@
          {
             // If then first check if a repetition is in the future
             long lNow = new Date().getTime() + 100;
-            long lSkipRepeats = ((lNow - mStartDate.getTime()) / mPeriod) + 1;
+            int lSkipRepeats = (int) ((lNow - mStartDate.getTime()) / mPeriod) + 1;
             log.debug("Old start date: " + mStartDate + ", now: " + new Date(lNow) + ", Skip repeats: " + lSkipRepeats);
             if (mInitialRepetitions > 0)
             {