> Until then, your patches can be checked in by someone else eh? :-)
>
sure thing, no problem :-), as long as somebody can commit these fixes.
I have attached the diff for the files i changed..
Can somebody please commit these changes. I have also attached the source
for these...
Thanks,
Ram.
___________________________________________________________
FREE voicemail, email and fax, all in one place. Sign Up Now! http://www.mybc.com
fixes.jar
cvs diff BinaryHeap.java (in directory
C:\jakarta-avalon\src\java\org\apache\avalon\util\)
Index: BinaryHeap.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon/src/java/org/apache/avalon/util/BinaryHeap.java,v
retrieving revision 1.1
diff -r1.1 BinaryHeap.java
16a17
> * @author <a href="mailto:[EMAIL PROTECTED]">Ram Chidambaram</a>
75c76,77
< return ( m_elements.length == m_size );
---
> //+1 as element 0 is noop
> return ( m_elements.length == m_size+1 );
113a116,119
>
> //set the unused element to 'null' so that the garbage collector
> //can free the object if not used anywhere else.(remove reference)
> m_elements[ m_size + 1 ] = null;
*****CVS exited normally with code 1*****
cvs diff DefaultTimeScheduler.java (in directory
C:\jakarta-avalon-cornerstone\src\java\org\apache\cornerstone\blocks\scheduler\)
Index: DefaultTimeScheduler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.1
diff -r1.1 DefaultTimeScheduler.java
26a27
> * @author <a href="mailto:[EMAIL PROTECTED]">Ram Chidambaram</a>
88a90
> m_entries.remove( name );
118,121c120,136
< entry = new TimeScheduledEntry( timeEntry.getName(),
< timeEntry.getTimeTrigger(),
< timeEntry.getTarget() );
< timeEntry.invalidate();
---
> try
> {
> entry = new TimeScheduledEntry( timeEntry.getName(),
>
>timeEntry.getTimeTrigger().getClone(),
> timeEntry.getTarget() );
> timeEntry.invalidate();
>
> // remove old refernce to the entry..so that next time
> // somebody calls getEntry( name ), we will get the new valid entry.
> m_entries.remove( timeEntry.getName() );
> m_entries.put( timeEntry.getName(), entry );
> }
> catch( final CloneNotSupportedException cnse )
> {
> //not sure what to do with this....
> //but this should never happen as interface TimeTrigger is
>Cloneable.
> }
194c209
< final TimeScheduledEntry entry =
---
> TimeScheduledEntry entry =
195a211,224
>
> //if job has been invalidated then remove it and continue
> while( !entry.isValid() )
> {
> m_priorityQueue.pop();
>
> if ( m_priorityQueue.isEmpty() ) break;
>
> entry = (TimeScheduledEntry)m_priorityQueue.peek();
> }
>
> if ( m_priorityQueue.isEmpty() )
> continue;
>
212,214d240
< //if job has been invalidated then remove it and continue
< if( !entry.isValid() ) continue;
<
226a253
>
*****CVS exited normally with code 1*****
cvs diff DefaultTimeScheduler.xinfo (in directory
C:\jakarta-avalon-cornerstone\src\java\org\apache\cornerstone\blocks\scheduler\)
Index: DefaultTimeScheduler.xinfo
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.xinfo,v
retrieving revision 1.1
diff -r1.1 DefaultTimeScheduler.xinfo
8a9
> <patcher name="Ram Chidambaram" email="[EMAIL PROTECTED]"/>
*****CVS exited normally with code 1*****
cvs diff TimeTrigger.java (in directory
C:\jakarta-avalon-cornerstone\src\java\org\apache\cornerstone\services\scheduler\)
Index: TimeTrigger.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/TimeTrigger.java,v
retrieving revision 1.1
diff -r1.1 TimeTrigger.java
14a15
> * @author <a href="mailto:[EMAIL PROTECTED]">Ram Chidambaram</a>
17c18
< extends Trigger
---
> extends Trigger, Cloneable
24a26,34
>
> /**
> * Get a clone of the original TimeTrigger with adjusted time sensitive info.
> *
> * @return a new copy of the TimeTrigger
> * @exception CloneNotSupportedException if trigger cannot be cloned
> */
> TimeTrigger getClone()
> throws CloneNotSupportedException;
*****CVS exited normally with code 1*****
cvs diff PeriodicTimeTrigger.java (in directory
C:\jakarta-avalon-cornerstone\src\java\org\apache\cornerstone\services\scheduler\)
Index: PeriodicTimeTrigger.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/PeriodicTimeTrigger.java,v
retrieving revision 1.1
diff -r1.1 PeriodicTimeTrigger.java
13a14
> * @author <a href="mailto:[EMAIL PROTECTED]">Ram Chidambaram</a>
19a21
> private final long m_triggerTime;
27c29
< m_startTime = current;
---
> m_triggerTime = current;
31c33
< m_startTime = current + startTime;
---
> m_triggerTime = current + startTime;
33a36
> m_startTime = startTime;
44c47
< if( time <= m_startTime ) return m_startTime;
---
> if( time <= m_triggerTime ) return m_triggerTime;
49c52
< final long over = time - m_startTime;
---
> final long over = time - m_triggerTime;
53a57,66
> }
>
> /**
> * Get a clone of the original TimeTrigger with adjusted time sensitive info.
> *
> * @return a new copy of this TimeTrigger
> */
> public TimeTrigger getClone()
> {
> return new PeriodicTimeTrigger( (int) m_startTime, (int) m_period );
*****CVS exited normally with code 1*****
cvs diff CronTimeTrigger.java (in directory
C:\jakarta-avalon-cornerstone\src\java\org\apache\cornerstone\services\scheduler\)
Index: CronTimeTrigger.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/CronTimeTrigger.java,v
retrieving revision 1.1
diff -r1.1 CronTimeTrigger.java
17a18
> * @author <a href="mailto:[EMAIL PROTECTED]">Ram Chidambaram</a>
225a227,237
> }
>
> /**
> * Get a clone of the original TimeTrigger.
> *
> * @return a new copy of this TimeTrigger
> */
> public TimeTrigger getClone()
> throws CloneNotSupportedException
> {
> return (TimeTrigger) this.clone();
*****CVS exited normally with code 1*****
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
