From d7d2952eebfa6243d597bde53b961d0bfe7a8d9f Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Fri, 13 Nov 2015 12:00:26 +0100 Subject: [PATCH] Fixed missing NPE check and println to stderr --- .../genesys2/server/service/impl/GeoRegionServiceImpl.java | 7 ++++++- .../server/servlet/controller/SelectionController.java | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java b/src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java index 11120660e..4c62c519f 100644 --- a/src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java +++ b/src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java @@ -56,8 +56,13 @@ public class GeoRegionServiceImpl implements GeoRegionService { @Override public GeoRegion getRegion(Country country) { + // NPE check + country.getId(); + GeoRegion geoRegion = geoRegionRepository.findByCountry(country); - geoRegion.getCountries().size(); + if (geoRegion != null) { + geoRegion.getCountries().size(); + } return geoRegion; } diff --git a/src/main/java/org/genesys2/server/servlet/controller/SelectionController.java b/src/main/java/org/genesys2/server/servlet/controller/SelectionController.java index d5a0f57ab..4218ddb23 100644 --- a/src/main/java/org/genesys2/server/servlet/controller/SelectionController.java +++ b/src/main/java/org/genesys2/server/servlet/controller/SelectionController.java @@ -147,14 +147,14 @@ public class SelectionController extends BaseController { final String[] splits = accessionIds.split("[,;\\t\\n]+"); for (final String s : splits) { - System.err.println(">> '" + s.trim() + "'"); + // System.err.println(">> '" + s.trim() + "'"); try { final Accession accession = genesysService.getAccession(instCode, s.trim()); if (accession != null) { - System.err.println("\t" + accession.getId()); + // System.err.println("\t" + accession.getId()); selectionBean.add(accession.getId()); } else { - System.err.println("\t NF='" + s + "'"); + // System.err.println("\t NF='" + s + "'"); } } catch (NonUniqueAccessionException e) { // Non-unique -- GitLab