Author: jruchaud Date: 2010-02-09 16:31:45 +0100 (Tue, 09 Feb 2010) New Revision: 2862 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java Log: #116 Rollback des transactions pour toutes les exceptions pas seulement la TopiaException Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -25,7 +25,6 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service d'authentification. @@ -68,7 +67,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -98,7 +97,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -71,7 +71,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -101,7 +101,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } @@ -131,7 +131,7 @@ } return resu; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -157,7 +157,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -189,7 +189,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -224,7 +224,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -262,7 +262,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -29,7 +29,6 @@ import org.chorem.pollen.business.persistence.PollenModelDAOHelper; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des commentaires. @@ -75,7 +74,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -104,7 +103,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } @@ -131,7 +130,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -157,7 +156,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -189,7 +188,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -227,7 +226,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -36,7 +36,6 @@ import org.chorem.pollen.business.persistence.VotingListDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des listes. @@ -96,7 +95,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -141,7 +140,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } @@ -168,7 +167,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -194,7 +193,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -228,7 +227,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -260,7 +259,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -300,7 +299,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -339,7 +338,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -376,7 +375,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } @@ -422,7 +421,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -448,7 +447,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -484,7 +483,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -518,7 +517,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -550,7 +549,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -585,7 +584,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -625,7 +624,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -32,7 +32,6 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des comptes. @@ -79,7 +78,7 @@ log.debug("Entity created: " + topiaId); } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -117,7 +116,7 @@ } return pollAccountEntity; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -152,7 +151,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } @@ -176,7 +175,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -211,7 +210,7 @@ } return resu; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -245,7 +244,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -279,7 +278,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -313,7 +312,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -354,7 +353,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -39,7 +39,6 @@ import org.chorem.pollen.business.persistence.VotingList; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des sondages. @@ -127,7 +126,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -160,7 +159,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -186,7 +185,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -218,7 +217,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -250,7 +249,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -281,7 +280,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -316,7 +315,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -354,7 +353,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -407,7 +406,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -449,7 +448,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -487,7 +486,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -520,7 +519,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -29,7 +29,6 @@ import org.chorem.pollen.business.persistence.PreventRuleDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Gestion des règles de notification. @@ -72,7 +71,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; } finally { @@ -104,7 +103,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } @@ -137,7 +136,7 @@ } return resu; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -165,7 +164,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -199,7 +198,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -240,7 +239,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -43,7 +43,6 @@ import org.chorem.pollen.votecounting.services.ServiceVoteCounting; import org.chorem.pollen.votecounting.services.ServiceVoteCountingImpl; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des résultats. @@ -172,7 +171,7 @@ resultListDTO.setVoteCountingResultDTO(result); return resultListDTO; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -251,7 +250,7 @@ } return filename; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -28,7 +28,6 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des utilisateurs. @@ -73,7 +72,7 @@ } return topiaId; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -99,7 +98,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -124,7 +123,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -156,7 +155,7 @@ } return result; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -194,7 +193,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { @@ -223,7 +222,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -250,7 +249,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -274,7 +273,7 @@ log.debug("Entity exists for the login " + login + ": " + userExists); } - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return true; } finally { @@ -299,7 +298,7 @@ log.debug("Entity exists for the email " + email + ": " + userExists); } - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return true; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -32,7 +32,6 @@ import org.chorem.pollen.business.persistence.VoteDAO; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des votes. @@ -142,7 +141,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -167,7 +166,7 @@ } return true; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return false; } finally { @@ -206,7 +205,7 @@ } return results; - } catch (TopiaException e) { + } catch (Exception e) { ContextUtil.doCatch(e, transaction); return null; } finally { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-09 14:30:00 UTC (rev 2861) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-09 15:31:45 UTC (rev 2862) @@ -289,7 +289,7 @@ } } - public static void doCatch(TopiaException e, TopiaContext transaction) { + public static void doCatch(Exception e, TopiaContext transaction) { doCatch(e, transaction, "Échec lors du déroulement de la transaction"); }