[FIXED JENKINS-46295] Handle the case where the query optimization is…

… for a deleted branch
jenkinsci · Aug 29, 2017 · 4998943 · 4998943
1 parent 6810318
commit 4998943
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
@@ -1767,11 +1767,17 @@ protected Iterable<GHBranch> create() {
             try {
                 request.checkApiRateLimit();
                 Set<String> branchNames = request.getRequestedOriginBranchNames();
-                    if (branchNames != null && branchNames.size() == 1) {
-                        String branchName = branchNames.iterator().next();
-                        request.listener().getLogger().format("%n  Getting remote branch %s...%n", branchName);
-                        return Collections.singletonList(repo.getBranch(branchName));
+                if (branchNames != null && branchNames.size() == 1) {
+                    String branchName = branchNames.iterator().next();
+                    request.listener().getLogger().format("%n  Getting remote branch %s...%n", branchName);
+                    try {
+                        GHBranch branch = repo.getBranch(branchName);
+                        return Collections.singletonList(branch);
+                    } catch (FileNotFoundException e) {
+                        // branch does not currently exist
+                        return Collections.emptyList();
                     }
+                }
                 request.listener().getLogger().format("%n  Getting remote branches...%n");
                 return repo.getBranches().values();
             } catch (IOException | InterruptedException e) {