Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java	(revision 11535)
@@ -69,4 +69,5 @@
                 } catch (InterruptedException e) {
                     Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
+                    Thread.currentThread().interrupt();
                 } catch (InvocationTargetException e) {
                     Throwable t = e.getTargetException();
Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 11535)
@@ -376,4 +376,5 @@
                 } catch (InterruptedException ex) {
                     Main.warn(ex, "InterruptedException while reading local plugin information");
+                    Thread.currentThread().interrupt();
                 }
 
Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 11535)
@@ -406,4 +406,5 @@
             LOG.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException());
             Main.warn(e);
+            Thread.currentThread().interrupt();
         }
         LOG.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrlNoException());
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11535)
@@ -410,4 +410,5 @@
                         // Occurs frequently during JOSM shutdown, log set to trace only
                         Main.trace("InterruptedException in "+MapStatus.class.getSimpleName());
+                        Thread.currentThread().interrupt();
                     } catch (InvocationTargetException e) {
                         Main.warn(e);
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 11535)
@@ -704,4 +704,5 @@
                         } catch (InterruptedException ex) {
                             Main.warn("InterruptedException in "+NavigatableComponent.class.getSimpleName()+" during smooth scrolling");
+                            Thread.currentThread().interrupt();
                         }
                     }
Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java	(revision 11535)
@@ -114,4 +114,5 @@
                     Main.warn(ex, "InterruptedException in " + Utils.class.getSimpleName()
                             + " while getting clipboard content");
+                    Thread.currentThread().interrupt();
                 }
             } catch (NullPointerException e) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 11535)
@@ -525,4 +525,5 @@
                     } catch (InterruptedException e1) {
                         Main.warn(e1, "InterruptedException in ChangesetDialog while downloading changeset header");
+                        Thread.currentThread().interrupt();
                     } catch (ExecutionException e2) {
                         Main.error(e2);
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 11535)
@@ -230,4 +230,5 @@
             Main.trace(e);
             lastException = e;
+            Thread.currentThread().interrupt();
         } catch (InvocationTargetException e) {
             Main.trace(e);
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 11535)
@@ -82,4 +82,5 @@
                 } catch (InterruptedException e) {
                     Main.warn("InterruptedException in "+getClass().getSimpleName()+" while loading image "+file.getPath());
+                    Thread.currentThread().interrupt();
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 11535)
@@ -115,4 +115,5 @@
         } catch (InterruptedException e) {
             Main.error(" InterruptedException while loading thumb");
+            Thread.currentThread().interrupt();
             return null;
         }
@@ -151,4 +152,5 @@
             } catch (InterruptedException ie) {
                 Main.warn("InterruptedException while drawing thumb");
+                Thread.currentThread().interrupt();
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java	(revision 11535)
@@ -67,4 +67,5 @@
                 } catch (InterruptedException ex) {
                     Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
+                    Thread.currentThread().interrupt();
                 }
             }
Index: trunk/src/org/openstreetmap/josm/io/FileWatcher.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileWatcher.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/io/FileWatcher.java	(revision 11535)
@@ -114,4 +114,5 @@
                 key = watcher.take();
             } catch (InterruptedException x) {
+                Thread.currentThread().interrupt();
                 return;
             }
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 11535)
@@ -563,4 +563,5 @@
             } catch (InterruptedException ex) {
                 Main.warn("InterruptedException in "+getClass().getSimpleName()+" during sleep");
+                Thread.currentThread().interrupt();
             }
         }
Index: trunk/src/org/openstreetmap/josm/tools/HttpClient.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 11535)
@@ -664,4 +664,5 @@
         } catch (InterruptedException ex) {
             Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
+            Thread.currentThread().interrupt();
         }
         connection.disconnect();
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 11535)
@@ -133,4 +133,5 @@
                                     } catch (InterruptedException e) {
                                         Main.warn(e);
+                                        Thread.currentThread().interrupt();
                                     }
                                 }
Index: trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java	(revision 11534)
+++ trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java	(revision 11535)
@@ -82,4 +82,5 @@
             } catch (InterruptedException e) {
                 displayFor(BugReport.intercept(e));
+                Thread.currentThread().interrupt();
             }
         }