Skip to content

Commit c653ae3

Browse files
committed
Fixed file comment, larger timeout for a test
1 parent a82eff9 commit c653ae3

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/main/java/rx/internal/util/BackpressureDrainManager.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
/*
2-
* Copyright 2011 David Karnok
3-
*
1+
/**
2+
* Copyright 2014 Netflix, Inc.
3+
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
1716
package rx.internal.util;
1817

1918
import java.util.concurrent.atomic.AtomicLongFieldUpdater;

src/test/java/rx/internal/operators/OperatorOnBackpressureBufferTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testNoBackpressureSupport() {
4747
ts.assertNoErrors();
4848
}
4949

50-
@Test(timeout = 500)
50+
@Test(timeout = 2000)
5151
public void testFixBackpressureWithBuffer() throws InterruptedException {
5252
final CountDownLatch l1 = new CountDownLatch(100);
5353
final CountDownLatch l2 = new CountDownLatch(150);

0 commit comments

Comments
 (0)