This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit edc785dce74a569728cb8d6fe6b55d6e8ed2a1db Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 21 16:55:46 2014 +0200 fix conflit of error --- .../src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java | 2 +- pollen-rest-api/src/main/resources/mapping | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java index a5d6875..b2ea0e8 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java @@ -49,7 +49,7 @@ public class ErrorAction extends WebMotionController { } - public FavoriteListImportException on400Form(HttpContext context, FavoriteListImportException e) { + public FavoriteListImportException on400Import(HttpContext context, FavoriteListImportException e) { PollenRestApiUtil.prepareResponse(context); diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index c17b4c7..f1d6520 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -40,9 +40,8 @@ org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException org.chorem.pollen.services.service.security.PollenUnauthorizedException ErrorAction.on403 org.chorem.pollen.services.service.security.PollenInvalidPermissionException ErrorAction.on403 org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException ErrorAction.on403 -org.chorem.pollen.services.service.security.PollenInvalidPasswordException ErrorAction.on400Form org.chorem.pollen.services.service.InvalidFormException ErrorAction.on400Form -org.chorem.pollen.services.service.FavoriteListImportException ErrorAction.on400Form +org.chorem.pollen.services.service.FavoriteListImportException ErrorAction.on400Import org.nuiton.topia.persistence.TopiaNoResultException ErrorAction.on404 org.chorem.pollen.services.service.InvalidEntityLinkException ErrorAction.on404 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.