From 3cb6a2a7b47ce22114865e4285c2941eb924ba9f Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sun, 24 Jan 2016 15:33:13 +0100 Subject: [PATCH] checked tx status before calling rollback --- src/main/java/org/jpacrepo/service/PacmanWebService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jpacrepo/service/PacmanWebService.java b/src/main/java/org/jpacrepo/service/PacmanWebService.java index 3453428..618f3c9 100644 --- a/src/main/java/org/jpacrepo/service/PacmanWebService.java +++ b/src/main/java/org/jpacrepo/service/PacmanWebService.java @@ -16,6 +16,7 @@ import javax.ejb.TransactionManagement; import javax.ejb.TransactionManagementType; import javax.inject.Inject; import javax.persistence.*; +import javax.transaction.Status; import javax.transaction.UserTransaction; import javax.ws.rs.*; import javax.ws.rs.core.*; @@ -213,8 +214,12 @@ public class PacmanWebService } catch (Exception e) { + e.printStackTrace(); Files.delete(file.toPath()); - ut.rollback(); + if(ut.getStatus() != Status.STATUS_NO_TRANSACTION) + { + ut.rollback(); + } throw e; } }