Merge branch '1.3.x
This commit is contained in:
@@ -91,7 +91,7 @@ public final class RemoteSpringApplication {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
// Ignore
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ class FileWatchingFailureHandler implements FailureHandler {
|
||||
latch.await();
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
// Ignore
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
return Outcome.RETRY;
|
||||
}
|
||||
|
||||
@@ -239,7 +239,7 @@ public class FileSystemWatcher {
|
||||
scan();
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
// Ignore
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
remainingScans = this.remainingScans.get();
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ class DelayedLiveReloadTrigger implements Runnable {
|
||||
this.liveReloadServer.triggerReload();
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
// Ignore
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ public class TunnelClient implements SmartInitializingSingleton {
|
||||
this.serverThread.join(2000);
|
||||
}
|
||||
catch (InterruptedException ex) {
|
||||
// Ignore
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
this.serverThread = null;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user