Skip to content

Commit 7084c20

Browse files
authored
Merge pull request #16 from mpeltonen/issues/fix-thread-interruption
Preserve interrupted flag on InterruptedExceptions
2 parents b57766b + 98159b6 commit 7084c20

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

src/main/java/org/jtransforms/utils/CommonUtils.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public static void sleep(long millis)
6969
try {
7070
Thread.sleep(millis);
7171
} catch (InterruptedException e) {
72+
Thread.currentThread().interrupt();
7273
e.printStackTrace();
7374
}
7475
}
@@ -3786,6 +3787,7 @@ public void run()
37863787
try {
37873788
ConcurrencyUtils.waitForCompletion(futures);
37883789
} catch (InterruptedException ex) {
3790+
Thread.currentThread().interrupt();
37893791
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
37903792
} catch (ExecutionException ex) {
37913793
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -3860,6 +3862,7 @@ public void run()
38603862
try {
38613863
ConcurrencyUtils.waitForCompletion(futures);
38623864
} catch (InterruptedException ex) {
3865+
Thread.currentThread().interrupt();
38633866
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
38643867
} catch (ExecutionException ex) {
38653868
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -8984,6 +8987,7 @@ public void run()
89848987
try {
89858988
ConcurrencyUtils.waitForCompletion(futures);
89868989
} catch (InterruptedException ex) {
8990+
Thread.currentThread().interrupt();
89878991
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
89888992
} catch (ExecutionException ex) {
89898993
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -9058,6 +9062,7 @@ public void run()
90589062
try {
90599063
ConcurrencyUtils.waitForCompletion(futures);
90609064
} catch (InterruptedException ex) {
9065+
Thread.currentThread().interrupt();
90619066
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
90629067
} catch (ExecutionException ex) {
90639068
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -11130,6 +11135,7 @@ public void run()
1113011135
try {
1113111136
ConcurrencyUtils.waitForCompletion(futures);
1113211137
} catch (InterruptedException ex) {
11138+
Thread.currentThread().interrupt();
1113311139
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
1113411140
} catch (ExecutionException ex) {
1113511141
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -11172,6 +11178,7 @@ public void run()
1117211178
try {
1117311179
ConcurrencyUtils.waitForCompletion(futures);
1117411180
} catch (InterruptedException ex) {
11181+
Thread.currentThread().interrupt();
1117511182
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
1117611183
} catch (ExecutionException ex) {
1117711184
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -11214,6 +11221,7 @@ public void run()
1121411221
try {
1121511222
ConcurrencyUtils.waitForCompletion(futures);
1121611223
} catch (InterruptedException ex) {
11224+
Thread.currentThread().interrupt();
1121711225
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
1121811226
} catch (ExecutionException ex) {
1121911227
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
@@ -11256,6 +11264,7 @@ public void run()
1125611264
try {
1125711265
ConcurrencyUtils.waitForCompletion(futures);
1125811266
} catch (InterruptedException ex) {
11267+
Thread.currentThread().interrupt();
1125911268
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);
1126011269
} catch (ExecutionException ex) {
1126111270
Logger.getLogger(CommonUtils.class.getName()).log(Level.SEVERE, null, ex);

0 commit comments

Comments
 (0)