Author: tchemit Date: 2014-05-30 15:51:20 +0200 (Fri, 30 May 2014) New Revision: 1825 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1825 Log: fixes #5155 [TECH] Pouvoir charger la base m?\195?\170me si le protocole n'est pas pr?\195?\169sent Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-05-30 13:50:51 UTC (rev 1824) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-05-30 13:51:20 UTC (rev 1825) @@ -186,7 +186,32 @@ this.service = persistenceService; // load protocol and propagate it to service - getProtocol(); + if (isProtocolFilled()) { + + if (!persistenceService.isProtocolExist(getProtocolId())) { + + if (log.isErrorEnabled()) { + log.error("Could not find protocol with id: " + getProtocolId()); + } + + setProtocolId(null); + + } else { + + try { + getProtocol(); + } catch (Exception e) { + + if (log.isErrorEnabled()) { + log.error("Could not use load protocol with id:" + getProtocolId(), e); + } + setProtocolId(null); + + } + + } + + } loadSampleCategoryModel(config.getSampleCategoryModel()); }