Yes, replaced awaitUninterruptibly() calls in NettyClient and NettyTransportOutputStream with awaitUninterruptibly(long) with a timeout that suits the application + retry strategy (next call is always ok). Ugly hack in times of need, but it works, never hung since then.