ContentRepositoryImpl.removeContent handles InterruptedException by calling Thread.interrupted(), which does nothing, since the exception already tells us the thread has been interrupted. Interruption should be handled by doing any needed cleanup and then calling Thread.currentThread().interrupt().