Return empty list on error for listRepos()

JENKINS-45420
jenkinsci · Jul 11, 2017 · 26e810a · 26e810a
1 parent 768cb40
commit 26e810a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/p4/client/ClientHelper.java b/src/main/java/org/jenkinsci/plugins/p4/client/ClientHelper.java
@@ -1003,11 +1003,15 @@ public int getClientHead() throws Exception {
 	/**
 	 * List of Graph Repos within the client's view
 	 *
-	 * @return A list of Graph Repos
-	 * @throws Exception push up stack
+	 * @return A list of Graph Repos, empty list on error.
 	 */
-	public List<IRepo> listRepos() throws Exception {
-		List<IRepo> repos = iclient.getRepos();
+	public List<IRepo> listRepos() {
+		List<IRepo> repos = new ArrayList<>();
+		try {
+			repos = iclient.getRepos();
+		} catch (Exception e) {
+			logger.fine("No repos found: " + e.getMessage());
+		}
 		return repos;
 	}
 

diff --git a/src/main/java/org/jenkinsci/plugins/p4/scm/P4ChangeRequestSCMHead.java b/src/main/java/org/jenkinsci/plugins/p4/scm/P4ChangeRequestSCMHead.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.plugins.p4.scm;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.mixin.ChangeRequestSCMHead;
 
@@ -19,7 +18,6 @@ public class P4ChangeRequestSCMHead extends P4Head implements ChangeRequestSCMHe
 		this.review = review;
 	}
 
-	@NonNull
 	@Override
 	public String getId() {
 		return getName();
@@ -34,7 +32,6 @@ public String getReview() {
 	 *
 	 * @return a “target” or “base” branch
 	 */
-	@NonNull
 	@Override
 	public SCMHead getTarget() {
 		return target;