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/UserResource.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index 2bbc7d2..058289b 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -12,7 +12,6 @@
import javax.persistence.PersistenceException;
import javax.persistence.TypedQuery;
import javax.servlet.http.HttpServletRequest;
-import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
@@ -34,6 +33,7 @@
import net.curisit.securis.SeCurisException;
import net.curisit.securis.db.Organization;
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;
@@ -55,7 +55,7 @@
@Inject
TokenHelper tokenHelper;
- @Inject
+ @Context
EntityManager em;
private static final Logger LOG = LogManager.getLogger(UserResource.class);
@@ -120,7 +120,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response create(User user, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
@@ -172,7 +172,7 @@
@PUT
@POST
@Path("/{uid}")
- @Transactional
+ @EnsureTransaction
@Consumes(MediaType.APPLICATION_JSON)
@Produces({
MediaType.APPLICATION_JSON
@@ -216,7 +216,7 @@
@DELETE
@Path("/{uid}")
- @Transactional
+ @EnsureTransaction
@Produces({
MediaType.APPLICATION_JSON
})
--
Gitblit v1.3.2