Author: bayard
Date: Tue Feb 6 14:49:50 2007
New Revision: 504351
URL: http://svn.apache.org/viewvc?view=rev&rev=504351
Log:
Applying test and fix for LANG-315
Modified:
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/StopWatch.java
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/StopWatchTest.java
Modified:
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/StopWatch.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/StopWatch.java?view=diff&rev=504351&r1=504350&r2=504351
==============================================================================
---
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/StopWatch.java
(original)
+++
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/StopWatch.java
Tue Feb 6 14:49:50 2007
@@ -115,7 +115,9 @@
if(this.runningState != STATE_RUNNING && this.runningState !=
STATE_SUSPENDED) {
throw new IllegalStateException("Stopwatch is not running. ");
}
- stopTime = System.currentTimeMillis();
+ if(this.runningState == STATE_RUNNING) {
+ stopTime = System.currentTimeMillis();
+ }
this.runningState = STATE_STOPPED;
}
Modified:
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/StopWatchTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/StopWatchTest.java?view=diff&rev=504351&r1=504350&r2=504351
==============================================================================
---
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/StopWatchTest.java
(original)
+++
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/StopWatchTest.java
Tue Feb 6 14:49:50 2007
@@ -108,6 +108,18 @@
assertTrue(totalTime < 1300);
}
+ public void testLang315() {
+ StopWatch watch = new StopWatch();
+ watch.start();
+ try {Thread.sleep(200);} catch (InterruptedException ex) {}
+ watch.suspend();
+ long suspendTime = watch.getTime();
+ try {Thread.sleep(200);} catch (InterruptedException ex) {}
+ watch.stop();
+ long totalTime = watch.getTime();
+ assertTrue( suspendTime == totalTime );
+ }
+
// test bad states
public void testBadStates() {
StopWatch watch = new StopWatch();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
