Skip to content

Commit f1928aa

Browse files
authored
Merge pull request #900 from oracle/owls-71954
OWLS-71954 remove synchronize block from Fiber.getName() to avoid deadlock
2 parents 686d8cc + f61d870 commit f1928aa

File tree

1 file changed

+5
-6
lines changed
  • operator/src/main/java/oracle/kubernetes/operator/work

1 file changed

+5
-6
lines changed

operator/src/main/java/oracle/kubernetes/operator/work/Fiber.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class Fiber implements Runnable, Future<Void>, ComponentRegistry {
6464
private CompletionCallback completionCallback;
6565

6666
/** The thread on which this Fiber is currently executing, if applicable. */
67-
private Thread currentThread;
67+
private volatile Thread currentThread;
6868

6969
private ExitCallback exitCallback;
7070

@@ -658,11 +658,10 @@ private String getName() {
658658
sb.append(parent.getName());
659659
sb.append("-child-");
660660
} else {
661-
synchronized (this) {
662-
if (currentThread != null) {
663-
sb.append(currentThread.getName());
664-
sb.append("-");
665-
}
661+
Thread thread = currentThread;
662+
if (thread != null) {
663+
sb.append(thread.getName());
664+
sb.append("-");
666665
}
667666
sb.append("fiber-");
668667
}

0 commit comments

Comments
 (0)