jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

ensured transaction is rolled back in case a ControllerException occurs

Browse Source
This commit is contained in:
Joern Muehlencord
2019-02-06 16:55:37 +01:00
parent 479145af6f
commit 6117cc6c10
3 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/src/main/java/de/muehlencord/shared/account/business/ControllerException.java
View File

@ -19,7 +19,7 @@ package de.muehlencord.shared.account.business;
* *
* @author joern.muehlencord * @author joern.muehlencord
*/ */
public class ControllerException extends RuntimeException { public class ControllerException extends Exception {
private static final long serialVersionUID = 5190280225284514859L; private static final long serialVersionUID = 5190280225284514859L;
public static final int CAUSE_ALREADY_EXISTS = 1; public static final int CAUSE_ALREADY_EXISTS = 1;

17
account/src/main/java/de/muehlencord/shared/account/util/AccountTransactionJoinInterceptor.java
View File

@ -15,6 +15,7 @@
*/ */
package de.muehlencord.shared.account.util; package de.muehlencord.shared.account.util;
import de.muehlencord.shared.account.business.ControllerException;
import javax.annotation.Priority; import javax.annotation.Priority;
import javax.inject.Inject; import javax.inject.Inject;
import javax.interceptor.AroundInvoke; import javax.interceptor.AroundInvoke;
@ -48,12 +49,28 @@ public class AccountTransactionJoinInterceptor {
@AroundInvoke @AroundInvoke
public Object joinTransaction(InvocationContext context) throws Exception { public Object joinTransaction(InvocationContext context) throws Exception {
try {
if (em == null) {
return context.proceed();
} else {
if (em.isJoinedToTransaction()) { if (em.isJoinedToTransaction()) {
LOGGER.trace("transaction already joined"); LOGGER.trace("transaction already joined");
} else { } else {
LOGGER.trace("joining transaction"); LOGGER.trace("joining transaction");
em.joinTransaction(); em.joinTransaction();
} }
}
return context.proceed(); return context.proceed();
} catch (ControllerException ex) {
if (em.isJoinedToTransaction()) {
em.getTransaction().rollback();
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Transaction rolled back");
}
}
throw ex;
} catch (Exception ex) {
throw ex;
}
} }
} }

14
account/src/main/java/de/muehlencord/shared/account/util/ApplicationTransactionJoinInterceptor.java
View File

@ -1,5 +1,6 @@
package de.muehlencord.shared.account.util; package de.muehlencord.shared.account.util;
import de.muehlencord.shared.account.business.ControllerException;
import javax.annotation.Priority; import javax.annotation.Priority;
import javax.inject.Inject; import javax.inject.Inject;
import javax.interceptor.AroundInvoke; import javax.interceptor.AroundInvoke;
@ -31,6 +32,7 @@ public class ApplicationTransactionJoinInterceptor {
@AroundInvoke @AroundInvoke
public Object joinTransaction(InvocationContext context) throws Exception { public Object joinTransaction(InvocationContext context) throws Exception {
try {
if (em == null) { if (em == null) {
return context.proceed(); return context.proceed();
} else { } else {
@ -42,6 +44,16 @@ public class ApplicationTransactionJoinInterceptor {
} }
} }
return context.proceed(); return context.proceed();
} catch (ControllerException ex) {
if (em.isJoinedToTransaction()) {
em.getTransaction().rollback();
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Transaction rolled back");
}
}
throw ex;
} catch (Exception ex) {
throw ex;
}
} }
} }