Skip to content

Commit 0b40649

Browse files
author
Jay Pitzeruse
committed
Applied the same logic to the maxResults parameter
1 parent c20b917 commit 0b40649

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/org/opensolaris/opengrok/web/JSONSearchServlet.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,12 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
124124

125125
int pageStart = getIntParameter(req, PARAM_START, 0);
126126

127-
int maxResults = MAX_RESULTS;
128-
String maxResultsParam = req.getParameter(PARAM_MAXRESULTS);
127+
Integer maxResultsParam = getIntParameter(req, PARAM_MAXRESULTS, null);
128+
int maxResults = maxResultsParam == null ? MAX_RESULTS : maxResultsParam;
129129
if (maxResultsParam != null) {
130-
try {
131-
maxResults = Integer.parseInt(maxResultsParam);
132-
result.put(PARAM_MAXRESULTS, maxResults);
133-
} catch (NumberFormatException ex) {
134-
}
130+
result.put(PARAM_MAXRESULTS, maxResults);
135131
}
132+
136133
List<Hit> results = new ArrayList<>(maxResults);
137134
engine.results(pageStart,
138135
numResults > maxResults ? maxResults : numResults, results);
@@ -175,7 +172,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
175172
* @return The integer value of the request param if present or the
176173
* defaultValue if none is present.
177174
*/
178-
private static int getIntParameter(final HttpServletRequest request, final String paramName, final int defaultValue) {
175+
private static Integer getIntParameter(final HttpServletRequest request, final String paramName, final Integer defaultValue) {
179176
final String paramValue = request.getParameter(paramName);
180177
if (paramValue == null) {
181178
return defaultValue;

0 commit comments

Comments
 (0)