From 00ee4c45d47ddece5eff225d0087a0d8e98abd02 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 5 Jun 2018 14:39:04 +0200
Subject: [PATCH] Avoiding nullpointerexception
---
.../servlet/OrganismController.java | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
index 637dceaa..6f887f7b 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
@@ -253,20 +253,23 @@ public class OrganismController extends HttpServlet {
SessionControllerGetter.getOrganismBean().storeOrganismCropCategories(user.getOrganizationId().getOrganizationId(), organism, cropCategoryIds);
//System.out.println(formValidation.getFormFields().toString());
- Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier");
- for(String key:externalResourceIdentifiers.keySet())
+ if(formValidation.getMultipleMapFormFields().get("externalResourceIdentifier") != null)
{
- FormField identifierField = externalResourceIdentifiers.get(key);
- if(identifierField.getWebValue() == null || identifierField.getWebValue().isEmpty())
+ Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier");
+ 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
Organism refreshedOrganism = em.find(Organism.class, organism.getOrganismId());
--
GitLab