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/ApplicationResource.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
index a2c17cd..872dfa6 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -9,7 +9,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;
@@ -29,6 +28,7 @@
import net.curisit.securis.SeCurisException;
import net.curisit.securis.db.Application;
import net.curisit.securis.db.ApplicationMetadata;
+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;
@@ -51,7 +51,7 @@
@Inject
TokenHelper tokenHelper;
- @Inject
+ @Context
EntityManager em;
private static final Logger LOG = LogManager.getLogger(ApplicationResource.class);
@@ -131,7 +131,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response create(Application app, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
@@ -156,7 +156,7 @@
@PUT
@POST
@Path("/{appid}")
- @Transactional
+ @EnsureTransaction
@Consumes(MediaType.APPLICATION_JSON)
@Produces({
MediaType.APPLICATION_JSON
@@ -204,7 +204,7 @@
@DELETE
@Path("/{appid}")
- @Transactional
+ @EnsureTransaction
@Produces({
MediaType.APPLICATION_JSON
})
--
Gitblit v1.3.2