Author: tchemit Date: 2012-10-05 17:43:15 +0200 (Fri, 05 Oct 2012) New Revision: 719 Url: http://forge.codelutin.com/repositories/revision/echobase/719 Log: fixes #1570: Erreur lors de la cr?\195?\169ation d'une application embarqu?\195?\169 si pas de campagne s?\195?\169lectionn?\195?\169e Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -135,15 +136,18 @@ log.info("Import done with user " + user.getEmail()); } - createImportLogEntry(getDAO(ImportLog.class), - user, - file, - importedVoyages); + if (importedVoyages != null && + !Iterables.isEmpty(importedVoyages)) { + createImportLogEntry(getDAO(ImportLog.class), + user, + file, + importedVoyages); + + } createLogBookEntry(getDAO(EntityModificationLog.class), user, - file, - importedVoyages); + file); commitTransaction("Could not commit db import from file " + file); @@ -166,8 +170,7 @@ protected abstract void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException; + File file) throws TopiaException; protected Iterable<Voyage> importTables(ImportStrategy<EchoBaseEntityEnum> strategy, ImportDbConfiguration model, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -88,8 +88,7 @@ @Override protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { + File file) throws TopiaException { dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import db", Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -99,8 +99,7 @@ @Override protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { + File file) throws TopiaException { dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import referential only db",