branch feature/#8171 updated (3df68fd -> 64a73f6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3df68fd Fix import for the voyage entity new 64a73f6 Fix NPE during import The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 64a73f68f6092fbe04d0dec4c84236ad27149fd3 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu May 12 17:36:13 2016 +0200 Fix NPE during import Summary of changes: .../services/service/importdb/strategy/EchoBaseImportStrategy.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 64a73f68f6092fbe04d0dec4c84236ad27149fd3 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 | 2 +- 2 files changed, 2 insertions(+), 2 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 0b0b1a2..aebeb21 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <!-- libraries version --> - <topiaVersion>3.1-SNAPSHOT</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>3.0-rc-11</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>.
participants (1)
-
codelutin.com scm