Skip to content

Commit b3ede9c

Browse files
aogburnfl4via
authored andcommitted
[UNDERTOW-2446] HttpServletRequestImpl.getParts shouldn't throw exception after already loading parts
1 parent 0ef8d7c commit b3ede9c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ public void logout() throws ServletException {
553553

554554
@Override
555555
public Collection<Part> getParts() throws IOException, ServletException {
556-
verifyMultipartServlet();
557556
if (parts == null) {
558557
loadParts();
559558
}
@@ -570,11 +569,7 @@ private void verifyMultipartServlet() {
570569

571570
@Override
572571
public Part getPart(final String name) throws IOException, ServletException {
573-
verifyMultipartServlet();
574-
if (parts == null) {
575-
loadParts();
576-
}
577-
for (Part part : parts) {
572+
for (Part part : getParts()) {
578573
if (part.getName().equals(name)) {
579574
return part;
580575
}
@@ -600,6 +595,7 @@ private void loadParts() throws IOException, ServletException {
600595
final ServletRequestContext requestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);
601596

602597
if (parts == null) {
598+
verifyMultipartServlet();
603599
final List<Part> parts = new ArrayList<>();
604600
String mimeType = exchange.getRequestHeaders().getFirst(Headers.CONTENT_TYPE);
605601
if (mimeType != null && mimeType.startsWith(MultiPartParserDefinition.MULTIPART_FORM_DATA)) {

0 commit comments

Comments
 (0)