Changeset 12365 in josm for trunk/src

Timestamp:

2017-06-09T19:57:55+02:00 (7 years ago)

Author:

michael2402

Message:

CyclicUploadDependencyException: Copy the collection passed to the constructor. Fix squid:S1149

Location:

trunk/src/org/openstreetmap/josm/actions/upload

Files:

• CyclicUploadDependencyException.java (modified) (4 diffs)
• RelationUploadOrderHook.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Stack;
@@ -14 +15 @@
  */
 public class CyclicUploadDependencyException extends Exception {
-    private final Stack<Relation> cycle;
+    private final List<Relation> cycle;
 
     /**
@@ -21 +22 @@
      */
     public CyclicUploadDependencyException(Stack<Relation> cycle) {
-        this.cycle = cycle;
+        this.cycle = new ArrayList<>(cycle);
     }
 
@@ -56 +57 @@
      */
     public List<Relation> getCyclicUploadDependency() {
-        return new ArrayList<>(cycle);
+        return Collections.unmodifiableList(cycle);
     }
 }

trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -66 +67 @@
      */
     protected void warnCyclicUploadDependency(CyclicUploadDependencyException e) {
-        List<Relation> dep = e.getCyclicUploadDependency();
+        List<Relation> dep = new ArrayList<>(e.getCyclicUploadDependency());
         Relation last = dep.get(dep.size() -1);
         Iterator<Relation> it = dep.iterator();