honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into netty4_transport 

* master:
  Restore interruption flag correctly in life cycle service

Original commit: elastic/x-pack-elasticsearch@5da6471c9a
This commit is contained in:
Jason Tedor 2016-08-03 11:11:16 -04:00
parent 832cb4fff2 196f74984c
commit 33ba52e735
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java
View File

@ -207,7 +207,7 @@ public class WatcherLifeCycleService extends AbstractComponent implements Cluste
try { try {
latch.await(); latch.await();
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.interrupted(); Thread.currentThread().interrupt();
} }
} }