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/OrganizationResource.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index 10a5f10..366bdcd 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -10,7 +10,6 @@
import javax.persistence.EntityManager;
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.GET;
@@ -30,7 +29,7 @@
import net.curisit.securis.SeCurisException;
import net.curisit.securis.db.Organization;
import net.curisit.securis.db.User;
-import net.curisit.securis.ioc.MyTrans;
+import net.curisit.securis.ioc.EnsureTransaction;
import net.curisit.securis.security.BasicSecurityContext;
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
@@ -131,7 +130,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @MyTrans
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response create(Organization org) {
@@ -198,11 +197,11 @@
@PUT
@POST
@Path("/{orgid}")
- @Transactional
@Consumes(MediaType.APPLICATION_JSON)
@Produces({
MediaType.APPLICATION_JSON
})
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response modify(Organization org, @PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
@@ -244,7 +243,7 @@
@DELETE
@Path("/{orgid}")
- @Transactional
+ @EnsureTransaction
@Produces({
MediaType.APPLICATION_JSON
})
--
Gitblit v1.3.2