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/LicenseResource.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 75e3fe2..b8494a6 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.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.DefaultValue;
@@ -41,6 +40,7 @@
 import net.curisit.securis.db.Pack;
 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;
@@ -81,7 +81,7 @@
     @Inject
     private LicenseHelper licenseHelper;
 
-    @Inject
+    @Context
     EntityManager em;
 
     @Inject
@@ -152,7 +152,7 @@
     @Produces({
         MediaType.APPLICATION_OCTET_STREAM
     })
-    @Transactional
+    @EnsureTransaction
     public Response download(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
 
         // EntityManager em = emProvider.get();
@@ -185,7 +185,7 @@
     @POST
     @Path("/{licId}/activate")
     @Securable
-    @Transactional
+    @EnsureTransaction
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces({
         MediaType.APPLICATION_JSON
@@ -233,7 +233,7 @@
     @POST
     @Path("/{licId}/send")
     @Securable
-    @Transactional
+    @EnsureTransaction
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces({
         MediaType.APPLICATION_JSON
@@ -289,7 +289,7 @@
     @POST
     @Path("/{licId}/cancel")
     @Securable
-    @Transactional
+    @EnsureTransaction
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces({
         MediaType.APPLICATION_JSON
@@ -340,7 +340,7 @@
     @Produces({
         MediaType.APPLICATION_JSON
     })
-    @Transactional
+    @EnsureTransaction
     public Response create(License lic, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
         // EntityManager em = emProvider.get();
 
@@ -462,7 +462,7 @@
     @POST
     @Path("/{licId}")
     @Securable
-    @Transactional
+    @EnsureTransaction
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces({
         MediaType.APPLICATION_JSON
@@ -509,7 +509,7 @@
 
     @DELETE
     @Path("/{licId}")
-    @Transactional
+    @EnsureTransaction
     @Securable
     @Produces({
         MediaType.APPLICATION_JSON
@@ -541,7 +541,7 @@
 
     @POST
     @Path("/{licId}/block")
-    @Transactional
+    @EnsureTransaction
     @Securable
     @Produces({
         MediaType.APPLICATION_JSON
@@ -574,7 +574,7 @@
 
     @POST
     @Path("/{licId}/unblock")
-    @Transactional
+    @EnsureTransaction
     @Securable
     @Produces({
         MediaType.APPLICATION_JSON

--
Gitblit v1.3.2