fix some InterruptException handling

Fix a number of places where catching InterruptException does not correctly reset the interrupted flag. 
yes, eclipse formatting file would be greatly appreciated.