Ensure that LaunchedURLClassLoader works when thread is interrupted

See gh-6683
pull/6855/head
hengyunabc 8 years ago committed by Andy Wilkinson
parent ffc0dc44ed
commit 937f85765c

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -244,17 +244,10 @@ public class RandomAccessDataFile implements RandomAccessData {
} }
public RandomAccessFile acquire() throws IOException { public RandomAccessFile acquire() throws IOException {
try { this.available.acquireUninterruptibly();
this.available.acquire(); RandomAccessFile file = this.files.poll();
RandomAccessFile file = this.files.poll(); return (file == null
return (file == null ? new RandomAccessFile(RandomAccessDataFile.this.file, "r") : file);
? new RandomAccessFile(RandomAccessDataFile.this.file, "r")
: file);
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
throw new IOException(ex);
}
} }
public void release(RandomAccessFile file) { public void release(RandomAccessFile file) {
@ -263,22 +256,16 @@ public class RandomAccessDataFile implements RandomAccessData {
} }
public void close() throws IOException { public void close() throws IOException {
this.available.acquireUninterruptibly(this.size);
try { try {
this.available.acquire(this.size); RandomAccessFile file = this.files.poll();
try { while (file != null) {
RandomAccessFile file = this.files.poll(); file.close();
while (file != null) { file = this.files.poll();
file.close();
file = this.files.poll();
}
}
finally {
this.available.release(this.size);
} }
} }
catch (InterruptedException ex) { finally {
Thread.currentThread().interrupt(); this.available.release(this.size);
throw new IOException(ex);
} }
} }

Loading…
Cancel
Save