Skip to content

Commit

Permalink
fix more merge fallout
Browse files Browse the repository at this point in the history
  • Loading branch information
twall committed Aug 19, 2015
1 parent ce29b6a commit 0e57990
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/com/sun/jna/CallbacksTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ public class CallbacksTest extends TestCase implements Paths {

private static final int THREAD_TIMEOUT = 5000;

protected void waitFor(Thread t) {
protected void waitFor(Thread thread) {
long start = System.currentTimeMillis();
while (t.isAlive()) {
Thread.sleep(10);
while (thread.isAlive()) {
try { Thread.sleep(10); } catch(InterruptedException e) { }
if (System.currentTimeMillis() - start > THREAD_TIMEOUT) {
fail("Timed out waiting for native thread " + thread
+ " to detach and terminate");
Expand Down

0 comments on commit 0e57990

Please sign in to comment.