root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-08-18 13:30:56 +01:00
parent e16c9d4e76 9300c6d422
commit e2ceece525
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

20
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/LaunchedURLClassLoaderTests.java
View File

@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson
*/ */
@SuppressWarnings("resource") @SuppressWarnings("resource")
public class LaunchedURLClassLoaderTests { public class LaunchedURLClassLoaderTests {
@ -85,4 +86,23 @@ public class LaunchedURLClassLoaderTests {
assertThat(resource.openConnection().getInputStream().read()).isEqualTo(3); assertThat(resource.openConnection().getInputStream().read()).isEqualTo(3);
} }
@Test
public void resolveFromNestedWhileThreadIsInterrupted() throws Exception {
File file = this.temporaryFolder.newFile();
TestJarCreator.createTestJar(file);
JarFile jarFile = new JarFile(file);
URL url = jarFile.getUrl();
LaunchedURLClassLoader loader = new LaunchedURLClassLoader(new URL[] { url },
null);
try {
Thread.currentThread().interrupt();
URL resource = loader.getResource("nested.jar!/3.dat");
assertThat(resource.toString(), equalTo(url + "nested.jar!/3.dat"));
assertThat(resource.openConnection().getInputStream().read(), equalTo(3));
}
finally {
Thread.interrupted();
}
}
} }