Skip to content

Commit aed041a

Browse files
committed
simplify
1 parent abfa229 commit aed041a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/java/io/jenkins/plugins/agent_build_history/AgentBuildHistory.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public static String getCookieValue(StaplerRequest2 req, String name, String def
5959

6060
private static int getRequestInteger(StaplerRequest2 req, String name, int defaultValue) {
6161
try {
62+
String value = req.getParameter(name);
63+
if (value == null) {
64+
return defaultValue;
65+
}
6266
return Integer.parseInt(req.getParameter(name));
6367
} catch (NumberFormatException e) {
6468
return defaultValue;
@@ -97,8 +101,8 @@ public RunListTable getHandler() {
97101
RunListTable runListTable = new RunListTable(computer.getName());
98102
//Get Parameters from URL
99103
StaplerRequest2 req = Stapler.getCurrentRequest2();
100-
int page = req.getParameter("page") != null ? getRequestInteger(req, "page", 1) : 1;
101-
int pageSize = req.getParameter("pageSize") != null ? getRequestInteger(req, "pageSize", 20) : Integer.parseInt(getCookieValue(req, "pageSize", "20"));
104+
int page = getRequestInteger(req, "page", 1);
105+
int pageSize = getRequestInteger(req, "pageSize", Integer.parseInt(getCookieValue(req, "pageSize", "20")));
102106
String sortColumn = req.getParameter("sortColumn") != null ? req.getParameter("sortColumn") : getCookieValue(req, "sortColumn", "startTime");
103107
String sortOrder = req.getParameter("sortOrder") != null ? req.getParameter("sortOrder") : getCookieValue(req, "sortOrder", "desc");
104108
String statusFilter = req.getParameter("status") != null ? req.getParameter("status") : "all";
@@ -136,7 +140,6 @@ public List<AgentExecution> getExecutionsForNode(List<String> indexLines, String
136140
}
137141
break;
138142
default:
139-
comparison = 0;
140143
}
141144
return sortOrder.equals("asc") ? comparison : -comparison;
142145
});

0 commit comments

Comments
 (0)