From 8a57be3e6397baed3b279eb27695038cfc68bb90 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 15 Aug 2014 15:20:21 +0200
Subject: [PATCH] wrap calls in db session

---
 .../com/commafeed/frontend/servlet/CustomCssServlet.java | 9 +++++++--
 .../commafeed/frontend/servlet/NextUnreadServlet.java    | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
index 2447e84e..866e2d3c 100644
--- a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
@@ -27,10 +27,15 @@ public class CustomCssServlet extends HttpServlet {
 	private final UserService userService;
 
 	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doGet(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		resp.setContentType("text/css");
 
-		final Optional<User> user = userService.login(req.getSession());
+		final Optional<User> user = new UnitOfWork<Optional<User>>(sessionFactory) {
+			@Override
+			protected Optional<User> runInSession() throws Exception {
+				return userService.login(req.getSession());
+			}
+		}.run();
 		if (!user.isPresent()) {
 			return;
 		}
diff --git a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
index bb8d7afa..51690ec0 100644
--- a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
@@ -43,11 +43,16 @@ public class NextUnreadServlet extends HttpServlet {
 	private final CommaFeedConfiguration config;
 
 	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doGet(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		final String categoryId = req.getParameter(PARAM_CATEGORYID);
 		String orderParam = req.getParameter(PARAM_READINGORDER);
 
-		final Optional<User> user = userService.login(req.getSession());
+		final Optional<User> user = new UnitOfWork<Optional<User>>(sessionFactory) {
+			@Override
+			protected Optional<User> runInSession() throws Exception {
+				return userService.login(req.getSession());
+			}
+		}.run();
 		if (!user.isPresent()) {
 			resp.sendRedirect(resp.encodeRedirectURL(config.getApplicationSettings().getPublicUrl()));
 			return;