This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9c1003f36950f66108e016b7bf574ce14e79b604 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu May 12 17:36:13 2016 +0200 Fix NPE during import --- .../services/service/importdb/strategy/EchoBaseImportStrategy.java | 2 +- pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java index 49d12d3..abb8b62 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java @@ -77,7 +77,7 @@ public class EchoBaseImportStrategy implements ImportStrategy<EchoBaseUserEntity importAllEntitiesIfNotExisting(dao, meta, importer, csvResult, nbRowBuffer); } else { - TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult, nbRowBuffer); + TopiaCsvImports.importAllEntities(persistenceContext.getHibernateSupport(), dao, meta, importer, csvResult, nbRowBuffer); } } diff --git a/pom.xml b/pom.xml index 38d6142..a09976c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -127,7 +128,7 @@ <!-- libraries version --> - <topiaVersion>3.1</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.