Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that LaunchedURLClassLoader works when thread is interrupted

Browse Source 
See gh-6683
This commit is contained in:
hengyunabc 2016-08-18 17:17:12 +08:00 committed by Andy Wilkinson
parent ffc0dc44ed
commit 937f85765c
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
View File

@ -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");
* 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 {
try {
this.available.acquire();
RandomAccessFile file = this.files.poll();
return (file == null
? new RandomAccessFile(RandomAccessDataFile.this.file, "r")
: file);
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
throw new IOException(ex);
}
this.available.acquireUninterruptibly();
RandomAccessFile file = this.files.poll();
return (file == null
? new RandomAccessFile(RandomAccessDataFile.this.file, "r") : file);
}
public void release(RandomAccessFile file) {
@ -263,22 +256,16 @@ public class RandomAccessDataFile implements RandomAccessData {
}
public void close() throws IOException {
this.available.acquireUninterruptibly(this.size);
try {
this.available.acquire(this.size);
try {
RandomAccessFile file = this.files.poll();
while (file != null) {
file.close();
file = this.files.poll();
}
}
finally {
this.available.release(this.size);
RandomAccessFile file = this.files.poll();
while (file != null) {
file.close();
file = this.files.poll();
}
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
throw new IOException(ex);
finally {
this.available.release(this.size);
}
}