litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test for a null EditConfiguration was coming too late to prevent a NullPointerException from the call to editConfig.getN3Generator(). Move the test, and add a return statement after forwarding to the error page.

Browse source
This commit is contained in:
jeb228 2011-02-07 17:05:22 +00:00
parent 015ee15340
commit b457504a69
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
View file

@ -135,16 +135,17 @@ public class N3MultiPartUpload extends VitroHttpServlet {
EditConfiguration editConfig = EditConfiguration.getConfigFromSession( EditConfiguration editConfig = EditConfiguration.getConfigFromSession(
session, request); session, request);
if (editConfig == null) {
RequestDispatcher rd = request
.getRequestDispatcher("/edit/messages/noEditConfigFound.jsp");
rd.forward(request, resp);
return;
}
EditSubmission submission = EditSubmission submission =
new EditSubmission(request.getParameterMap(), editConfig, request.getFiles()); new EditSubmission(request.getParameterMap(), editConfig, request.getFiles());
EditN3Generator n3Subber = editConfig.getN3Generator(); EditN3Generator n3Subber = editConfig.getN3Generator();
if (editConfig == null) {
RequestDispatcher rd = request
.getRequestDispatcher("/edit/messages/noEditConfigFound.jsp");
rd.forward(request, resp);
}
// check for form validation errors // check for form validation errors
Map<String, String> errors = submission.getValidationErrors(); Map<String, String> errors = submission.getValidationErrors();
EditSubmission.putEditSubmissionInSession(session, submission); EditSubmission.putEditSubmissionInSession(session, submission);