> I was fighting deadlocks in some Java code this week

Why? You have java.util.concurrent; you should never see a deadlock. You might see a performance degradation or maybe even livelock, but that's very, very, very rare.

What abjectly idiotic thing is in your Java codebase such that you have deadlocks?