Skip to content
Snippets Groups Projects
Commit 00ee4c45 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Avoiding nullpointerexception

parent 4089c300
Branches
Tags
No related merge requests found
...@@ -253,20 +253,23 @@ public class OrganismController extends HttpServlet { ...@@ -253,20 +253,23 @@ public class OrganismController extends HttpServlet {
SessionControllerGetter.getOrganismBean().storeOrganismCropCategories(user.getOrganizationId().getOrganizationId(), organism, cropCategoryIds); SessionControllerGetter.getOrganismBean().storeOrganismCropCategories(user.getOrganizationId().getOrganizationId(), organism, cropCategoryIds);
//System.out.println(formValidation.getFormFields().toString()); //System.out.println(formValidation.getFormFields().toString());
Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier"); if(formValidation.getMultipleMapFormFields().get("externalResourceIdentifier") != null)
for(String key:externalResourceIdentifiers.keySet())
{ {
FormField identifierField = externalResourceIdentifiers.get(key); Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier");
if(identifierField.getWebValue() == null || identifierField.getWebValue().isEmpty()) for(String key:externalResourceIdentifiers.keySet())
{ {
continue; FormField identifierField = externalResourceIdentifiers.get(key);
if(identifierField.getWebValue() == null || identifierField.getWebValue().isEmpty())
{
continue;
}
Integer externalResourceId = Integer.valueOf(key);
OrganismExternalResource organismExternalResource = new OrganismExternalResource();
OrganismExternalResourcePK pk = new OrganismExternalResourcePK(organism.getOrganismId(), externalResourceId);
organismExternalResource.setOrganismExternalResourcePK(pk);
organismExternalResource.setResourceIdentifier(identifierField.getWebValue());
SessionControllerGetter.getOrganismBean().storeOrganismExternalResource(organismExternalResource);
} }
Integer externalResourceId = Integer.valueOf(key);
OrganismExternalResource organismExternalResource = new OrganismExternalResource();
OrganismExternalResourcePK pk = new OrganismExternalResourcePK(organism.getOrganismId(), externalResourceId);
organismExternalResource.setOrganismExternalResourcePK(pk);
organismExternalResource.setResourceIdentifier(identifierField.getWebValue());
SessionControllerGetter.getOrganismBean().storeOrganismExternalResource(organismExternalResource);
} }
// Need to refresh organism after storing the external resources // Need to refresh organism after storing the external resources
Organism refreshedOrganism = em.find(Organism.class, organism.getOrganismId()); Organism refreshedOrganism = em.find(Organism.class, organism.getOrganismId());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment