We also need to update ids in case branch sources are added via getSourcesList().add(…), for example in a test

Author: jglick

src/main/java/jenkins/branch/MultiBranchProject.java

@@ -204,23 +204,7 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
             state.reset();
         }
         // optimize lookup of sources by building a temporary map that is equivalent to getSCMSource(id) in results
-        Map<String, SCMSource> sourceMap = new HashMap<>();
-        int count = 1;
-        for (BranchSource source : sources) {
-            SCMSource s = source.getSource();
-            String id = s.getId();
-            if (id.isBlank()) {
-                // Generate ids of the form "1", "2", … on demand
-                while (sourceMap.containsKey(Integer.toString(count))) {
-                    count++;
-                }
-                id = Integer.toString(count);
-                s.setId(id);
-            }
-            if (!sourceMap.containsKey(id)) { // only the first match should win
-                sourceMap.put(id, s);
-            }
-        }
+        Map<String, SCMSource> sourceMap = buildSourceMap();
         for (P item : getItems(factory::isProject)) {
             Branch oldBranch = factory.getBranch(item);
             SCMSource source = sourceMap.get(oldBranch.getSourceId());
@@ -259,6 +243,27 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
         }
     }
 
+    private Map<String, SCMSource> buildSourceMap() {
+        Map<String, SCMSource> sourceMap = new HashMap<>();
+        int count = 1;
+        for (BranchSource source : sources) {
+            SCMSource s = source.getSource();
+            String id = s.getId();
+            if (id.isBlank()) {
+                // Generate ids of the form "1", "2", … on demand
+                while (sourceMap.containsKey(Integer.toString(count))) {
+                    count++;
+                }
+                id = Integer.toString(count);
+                s.setId(id);
+            }
+            if (!sourceMap.containsKey(id)) { // only the first match should win
+                sourceMap.put(id, s);
+            }
+        }
+        return sourceMap;
+    }
+
     /**
      * Consolidated initialization code.
      */
@@ -435,6 +440,7 @@ public void setSourcesList(List<BranchSource> sources) throws IOException {
         if (this.sources.isEmpty() || sources.isEmpty()) {
             // easy
             this.sources.replaceBy(sources);
+            buildSourceMap();
             return;
         }
         Set<String> oldIds = sourceIds(this.sources);
@@ -502,6 +508,12 @@ private Set<String> sourceIds(List<BranchSource> sources) {
         return result;
     }
 
+    @Override
+    public synchronized void save() throws IOException {
+        buildSourceMap();
+        super.save();
+    }
+
     private boolean equalButForId(SCMSource a, SCMSource b) {
         if (!a.getClass().equals(b.getClass())) {
             return false;