Merge branch '1.3.x

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java

@@ -69,7 +69,7 @@ public class ShutdownEndpoint extends AbstractEndpoint<Map<String, Object>>
 						Thread.sleep(500L);
 					}
 					catch (InterruptedException ex) {
-						// Swallow exception and continue
+						Thread.currentThread().interrupt();
 					}
 					ShutdownEndpoint.this.context.close();
 				}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java

@@ -93,7 +93,7 @@ public class HeapdumpMvcEndpoint extends AbstractMvcEndpoint implements MvcEndpo
 			}
 		}
 		catch (InterruptedException ex) {
-			// Ignore
+			Thread.currentThread().interrupt();
 		}
 		response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
 	}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpointTests.java

@@ -93,6 +93,7 @@ public class HeapdumpMvcEndpointTests {
 	public void invokeWhenLockedShouldReturnTooManyRequestsStatus() throws Exception {
 		this.endpoint.setLocked(true);
 		this.mvc.perform(get("/heapdump")).andExpect(status().isTooManyRequests());
+		assertThat(Thread.interrupted()).isTrue();
 	}
 
 	@Test

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java

@@ -91,7 +91,7 @@ public final class RemoteSpringApplication {
 				Thread.sleep(1000);
 			}
 			catch (InterruptedException ex) {
-				// Ignore
+				Thread.currentThread().interrupt();
 			}
 		}
 	}

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/FileWatchingFailureHandler.java

@@ -52,7 +52,7 @@ class FileWatchingFailureHandler implements FailureHandler {
 			latch.await();
 		}
 		catch (InterruptedException ex) {
-			// Ignore
+			Thread.currentThread().interrupt();
 		}
 		return Outcome.RETRY;
 	}

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java

@@ -239,7 +239,7 @@ public class FileSystemWatcher {
 					scan();
 				}
 				catch (InterruptedException ex) {
-					// Ignore
+					Thread.currentThread().interrupt();
 				}
 				remainingScans = this.remainingScans.get();
 			}

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java

@@ -96,7 +96,7 @@ class DelayedLiveReloadTrigger implements Runnable {
 			this.liveReloadServer.triggerReload();
 		}
 		catch (InterruptedException ex) {
-			// Ignore
+			Thread.currentThread().interrupt();
 		}
 	}
 

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java

@@ -106,7 +106,7 @@ public class TunnelClient implements SmartInitializingSingleton {
 					this.serverThread.join(2000);
 				}
 				catch (InterruptedException ex) {
-					// Ignore
+					Thread.currentThread().interrupt();
 				}
 				this.serverThread = null;
 			}

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java

@@ -273,6 +273,7 @@ public class HttpTunnelServer {
 						this.httpConnections.wait(HttpTunnelServer.this.longPollTimeout);
 					}
 					catch (InterruptedException ex) {
+						Thread.currentThread().interrupt();
 						closeHttpConnections();
 					}
 					httpConnection = this.httpConnections.pollFirst();
@@ -442,7 +443,7 @@ public class HttpTunnelServer {
 						}
 					}
 					catch (InterruptedException ex) {
-						// Ignore
+						Thread.currentThread().interrupt();
 					}
 				}
 			}

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

@@ -252,6 +252,7 @@ public class RandomAccessDataFile implements RandomAccessData {
 						: file);
 			}
 			catch (InterruptedException ex) {
+				Thread.currentThread().interrupt();
 				throw new IOException(ex);
 			}
 		}
@@ -276,6 +277,7 @@ public class RandomAccessDataFile implements RandomAccessData {
 				}
 			}
 			catch (InterruptedException ex) {
+				Thread.currentThread().interrupt();
 				throw new IOException(ex);
 			}
 		}

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java

@@ -167,6 +167,7 @@ public class StartMojo extends AbstractRunMojo {
 					this.lock.wait(wait);
 				}
 				catch (InterruptedException ex) {
+					Thread.currentThread().interrupt();
 					throw new IllegalStateException(
 							"Interrupted while waiting for Spring Boot app to start.");
 				}
@@ -275,6 +276,7 @@ public class StartMojo extends AbstractRunMojo {
 					this.lock.wait(wait);
 				}
 				catch (InterruptedException ex) {
+					Thread.currentThread().interrupt();
 					throw new IllegalStateException(
 							"Interrupted while waiting for Spring Boot app to start.");
 				}