Merge pull request #51 from jenkinsci/limit-describe

Limit output from describe. JENKINS-46671
jenkinsci · Sep 6, 2017 · 2cc9b3f · 2cc9b3f
2 parents 3d69292 + 905bb07
commit 2cc9b3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/p4/changes/P4ChangeEntry.java b/src/main/java/org/jenkinsci/plugins/p4/changes/P4ChangeEntry.java
@@ -106,7 +106,7 @@ public void setChange(ConnectionHelper p4, IChangelistSummary changelist) throws
 			files = p4.getShelvedFiles(changeId);
 			shelved = true;
 		} else {
-			files = p4.getChangeFiles(changeId);
+			files = p4.getChangeFiles(changeId, fileCountLimit + 1);
 			shelved = false;
 		}
 		if (files != null && files.size() > fileCountLimit) {

diff --git a/src/main/java/org/jenkinsci/plugins/p4/client/ConnectionHelper.java b/src/main/java/org/jenkinsci/plugins/p4/client/ConnectionHelper.java
@@ -275,7 +275,7 @@ public boolean login() throws Exception {
 
 			case TICKETPATH:
 				String path = authorisationConfig.getTicketPath();
-				if(path == null || path.isEmpty()) {
+				if (path == null || path.isEmpty()) {
 					path = connection.getTicketsFilePath();
 				}
 				connection.setTicketsFilePath(path);
@@ -548,8 +548,8 @@ public List<IFileSpec> getLabelFiles(String id, int limit) throws Exception {
 
 	// Use a describe for files to avoid MAXSCANROW limits.
 	// (backed-out part of change 16390)
-	public List<IFileSpec> getChangeFiles(int id) throws Exception {
-		List<IFileSpec> files = connection.getChangelistFiles(id);
+	public List<IFileSpec> getChangeFiles(int id, int limit) throws Exception {
+		List<IFileSpec> files = connection.getChangelistFiles(id, limit);
 		return files;
 	}