From 09f0f86d50933ea11eb3315e5728718e23d37dcf Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 11:34:27 +0000
Subject: [PATCH] #2283 fix - Changed EntityManager injection to @Context
---
securis/src/main/java/net/curisit/securis/services/PackResource.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index 9a5e7a5..558b5a4 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -9,7 +9,6 @@
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
-import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
@@ -35,6 +34,7 @@
import net.curisit.securis.db.PackMetadata;
import net.curisit.securis.db.PackStatus;
import net.curisit.securis.db.User;
+import net.curisit.securis.ioc.EnsureTransaction;
import net.curisit.securis.security.BasicSecurityContext;
import net.curisit.securis.security.Securable;
import net.curisit.securis.services.exception.SeCurisServiceException;
@@ -60,7 +60,7 @@
@Inject
TokenHelper tokenHelper;
- @Inject
+ @Context
EntityManager em;
@Inject
@@ -143,7 +143,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
public Response create(Pack pack, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Creating new pack");
// EntityManager em = emProvider.get();
@@ -239,7 +239,7 @@
@PUT
@POST
@Path("/{packId}")
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
@@ -267,6 +267,8 @@
currentPack.setCode(pack.getCode());
currentPack.setComments(pack.getComments());
currentPack.setNumLicenses(pack.getNumLicenses());
+ currentPack.setPreactivationValidPeriod(pack.getPreactivationValidPeriod());
+ currentPack.setRenewValidPeriod(pack.getRenewValidPeriod());
Set<PackMetadata> newMD = pack.getMetadata();
for (PackMetadata currentMd : currentPack.getMetadata()) {
@@ -294,7 +296,7 @@
@POST
@Path("/{packId}/activate")
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
@@ -320,7 +322,7 @@
@POST
@Path("/{packId}/putonhold")
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
@@ -346,7 +348,7 @@
@POST
@Path("/{packId}/cancel")
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
@@ -393,7 +395,7 @@
@Path("/{packId}")
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
- @Transactional
+ @EnsureTransaction
@Produces({
MediaType.APPLICATION_JSON
})
--
Gitblit v1.3.2