git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
wicket
/
components
/
src
/
main
/
java
/
org
/
wamblee
/
wicket
/
behavior
/
FlushEntityManagerBehavior.java
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/behavior/FlushEntityManagerBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/behavior/FlushEntityManagerBehavior.java
index 921f779f73426de0e87af99c9e052d899f7044eb..287bb64ca0bc0d114f88c2eb37a1275fb5d90637 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/behavior/FlushEntityManagerBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/behavior/FlushEntityManagerBehavior.java
@@
-20,6
+20,8
@@
import java.util.logging.Logger;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
+import javax.persistence.PersistenceException;
+import javax.persistence.TransactionRequiredException;
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
@@
-55,8
+57,11
@@
public class FlushEntityManagerBehavior extends AbstractPageBehavior {
if (entityManager.isOpen()) {
entityManager.flush();
}
if (entityManager.isOpen()) {
entityManager.flush();
}
- } catch (Exception e) { // TODO catch the Entity manager exceptions explicitly and rethrow, but log
- // the other onees.
+ } catch (TransactionRequiredException e) {
+ throw e;
+ } catch (PersistenceException e) {
+ throw e;
+ } catch (Exception e) {
LOGGER.log(Level.WARNING, "Could not flush entitymanager", e);
}
}
LOGGER.log(Level.WARNING, "Could not flush entitymanager", e);
}
}