Skip to content

Commit 261dc38

Browse files
akarnokdakarnokd
authored andcommitted
Negative schedule time now indicates immediate execution.
1 parent 50b618e commit 261dc38

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

rxjava-contrib/rxjava-swing/src/main/java/rx/schedulers/SwingScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public boolean isUnsubscribed() {
6464

6565
@Override
6666
public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
67-
long delay = unit.toMillis(delayTime);
67+
long delay = Math.max(0, unit.toMillis(delayTime));
6868
assertThatTheDelayIsValidForTheSwingTimer(delay);
6969
final BooleanSubscription s = BooleanSubscription.create();
7070
class ExecuteOnceAction implements ActionListener {

rxjava-contrib/rxjava-swing/src/test/java/rx/schedulers/SwingSchedulerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ public void testInvalidDelayValues() {
5151
final Worker inner = scheduler.createWorker();
5252
final Action0 action = mock(Action0.class);
5353

54-
exception.expect(IllegalArgumentException.class);
5554
inner.schedulePeriodically(action, -1L, 100L, TimeUnit.SECONDS);
5655

57-
exception.expect(IllegalArgumentException.class);
5856
inner.schedulePeriodically(action, 100L, -1L, TimeUnit.SECONDS);
5957

6058
exception.expect(IllegalArgumentException.class);

0 commit comments

Comments
 (0)