Changeset 11107 in josm for trunk

Timestamp:

2016-10-08T23:50:28+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2189 - Loops should not be infinite

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (2 diffs)
• bugreport/BugReportQueue.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -792 +792 @@
                 otherStart = j;
 
-                for (;;) {
+                boolean loop = true;
+                while (loop) {
                     /* Now find the end of this run of changes.  */
 
@@ -819 +820 @@
                         ++j;
                     } else {
-                        break;
+                        loop = false;
                     }
                 }

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java

@@ -60 +60 @@
             reportsToDisplay.add(report);
             if (displayThread == null) {
-                displayThread = new Thread(this::displayAll, "bug-report-display");
+                displayThread = new Thread(new BugReportDisplayRunnable(), "bug-report-display");
                 displayThread.start();
             }
@@ -67 +67 @@
     }
 
-    private void displayAll() {
-        try {
-            while (true) {
-                ReportedException e = getNext();
-                SuppressionMode suppress = displayFor(e);
-                handleDialogResult(e, suppress);
+    private class BugReportDisplayRunnable implements Runnable {
+
+        private volatile boolean running = true;
+
+        @Override
+        public void run() {
+            try {
+                while (running) {
+                    ReportedException e = getNext();
+                    handleDialogResult(e, displayFor(e));
+                }
+            } catch (InterruptedException e) {
+                displayFor(BugReport.intercept(e));
             }
-        } catch (InterruptedException e) {
-            displayFor(BugReport.intercept(e));
         }
     }