[kune-commits] r1409 - trunk/src/main/java/cc/kune/core/server/auth

Fri Jun 17 01:29:12 CEST 2011

Author: vjrj_
Date: 2011-06-17 01:29:11 +0200 (Fri, 17 Jun 2011)
New Revision: 1409

Modified:
   trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java
Log:
unitofwork removed

Modified: trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java
===================================================================

--- trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java	2011-06-16 17:48:38 UTC (rev 1408)
+++ trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java	2011-06-16 23:29:11 UTC (rev 1409)
@@ -32,7 +32,6 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.google.inject.persist.UnitOfWork;
 
 public class AuthenticatedMethodInterceptor implements MethodInterceptor {
 
@@ -45,15 +44,10 @@
   Provider<SessionService> sessionServiceProvider;
 
   @Inject
-  private UnitOfWork unitOfWork;
-
-  @Inject
   Provider<UserSession> userSessionProvider;
 
   @Override
   public Object invoke(final MethodInvocation invocation) throws Throwable {
-    unitOfWork.begin();
-
     final Object[] arguments = invocation.getArguments();
     // Some browsers getCookie returns "null" as String instead of null
     final String userHash = arguments[0] == null || arguments[0].equals("null") ? null
@@ -70,19 +64,16 @@
 
     if (userHash == null && mandatory) {
       // sessionService.getNewSession();
-      unitOfWork.end();
       throw new UserMustBeLoggedException();
     } else if (userSession.isUserNotLoggedIn() && mandatory) {
       // sessionService.getNewSession();
       LOG.info("Session expired (not logged in server and mandatory)");
-      unitOfWork.end();
       throw new SessionExpiredException();
     } else if (userSession.isUserNotLoggedIn() && userHash == null) {
       // Ok, do nothing
     } else if (userSession.isUserNotLoggedIn() && userHash != null) {
       // sessionService.getNewSession();
       LOG.info("Session expired (not logged in server)");
-      unitOfWork.end();
       throw new SessionExpiredException();
     } else if (!userSession.getHash().equals(userHash)) {
       final String serverHash = userSession.getHash();
@@ -90,11 +81,9 @@
       // sessionService.getNewSession();
       LOG.info("Session expired (userHash: " + userHash + " different from server hash: " + serverHash
           + ")");
-      unitOfWork.end();
       throw new SessionExpiredException();
     }
     final Object result = invocation.proceed();
-    unitOfWork.end();
     return result;
   }
 


