This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 49c99512344c3d67d190e1761f886a54230c7be0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 15 20:57:05 2015 +0100 fix NPE if no referential import done --- .../tutti/service/genericformat/GenericFormatImportService.java | 4 ++++ .../service/genericformat/GenericFormatReferentialImportResult.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java index e641ea3..0dbc1fc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java @@ -232,6 +232,7 @@ public class GenericFormatImportService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Skip import temporary gears (no file found)."); } + importContext.getImportResult().setImportedGears(new GenericFormatReferentialImportResult<Gear, Integer>()); } @@ -267,6 +268,7 @@ public class GenericFormatImportService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Skip import temporary persons (no file found)."); } + importContext.getImportResult().setImportedPersons(new GenericFormatReferentialImportResult<Person, Integer>()); } @@ -302,6 +304,7 @@ public class GenericFormatImportService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Skip import temporary species (no file found)."); } + importContext.getImportResult().setImportedSpecies(new GenericFormatReferentialImportResult<Species, Integer>()); } @@ -337,6 +340,7 @@ public class GenericFormatImportService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Skip import temporary vessels (no file found)."); } + importContext.getImportResult().setImportedVessels(new GenericFormatReferentialImportResult<Vessel, String>()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java index ff33d81..2eab11e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java @@ -24,6 +24,12 @@ public class GenericFormatReferentialImportResult<E extends TuttiReferentialEnti private final Map<String, String> idTranslationMap; + public GenericFormatReferentialImportResult() { + this.entitiesAdded = Collections.emptyMap(); + this.entitiesLinked = Collections.emptyMap(); + this.idTranslationMap = Collections.emptyMap(); + } + public GenericFormatReferentialImportResult(ReferentialImportRequest<E, K> importRequest, ReferentialImportResult<E> importResult) { Map<String, String> translationMap = new TreeMap<>(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.