Author: kmorin Date: 2014-10-03 12:33:08 +0200 (Fri, 03 Oct 2014) New Revision: 666 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/666 Log: - correction d?\195?\169tection client - ajout des headers de license - correction site version Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_620__modification_newclient_edireturn.sql trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_620__modification_newclient_edireturn.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml trunk/pom.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-03 09:25:55 UTC (rev 665) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-10-03 10:33:08 UTC (rev 666) @@ -32,6 +32,8 @@ import java.util.List; import java.util.Objects; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.lang3.StringUtils; @@ -96,7 +98,7 @@ if (CollectionUtils.isNotEmpty(clients)) { int i = 0; while (client == null && i < clients.size()) { - Client c = clients.get(i); + Client c = clients.get(i++); if (StringUtils.isBlank(company) || Objects.equals(company, c.getCompany())) { client = c; } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-03 09:25:55 UTC (rev 665) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-10-03 10:33:08 UTC (rev 666) @@ -241,10 +241,16 @@ // if client code is null, do not manage client at all Client client = null; if (StringUtils.isNotBlank(clientCode)) { - client = getClientService().getClientForCode(clientCode, company); - if (client == null) { - String message = t("faxtomail.service.email.save.clientCode.error", clientCode); - throw new InvalidClientException(message); + Client emailClient = email.getClient(); + if (emailClient != null && clientCode.equals(email.getClient().getCode())) { + client = emailClient; + + } else { + client = getClientService().getClientForCode(clientCode, company); + if (client == null) { + String message = t("faxtomail.service.email.save.clientCode.error", clientCode); + throw new InvalidClientException(message); + } } } email.setClient(client); Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_620__modification_newclient_edireturn.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_620__modification_newclient_edireturn.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/resources/log4j2.xml ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-03 09:25:55 UTC (rev 665) +++ trunk/pom.xml 2014-10-03 10:33:08 UTC (rev 666) @@ -93,6 +93,7 @@ <platform>codelutin.com</platform> <projectId>faxtomail</projectId> <siteDeployClassifier /> + <sitePluginVersion>3.3</sitePluginVersion> <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion>