Changeset 2592 for trunk/components/server/src/ome/services/sessions/SessionManagerImpl.java

Timestamp:

07/05/08 22:16:04 (5 months ago)

Author:

jmoore

Message:

ticket:1018 - Initial version of OmeroSessions reference counting

Implementation is incomplete in the blitz case since there are two
possible "closers" - the user and the glacier session, which must
be taken into account.

Files:

• trunk/components/server/src/ome/services/sessions/SessionManagerImpl.java (modified) (8 diffs)

trunk/components/server/src/ome/services/sessions/SessionManagerImpl.java

@@ -73 +73 @@
 
     // Injected
-    OmeroContext context;
-    Roles roles;
-    SessionCache cache;
-    Executor executor;
-    long defaultTimeToIdle;
-    long defaultTimeToLive;
+    protected OmeroContext context;
+    protected Roles roles;
+    protected SessionCache cache;
+    protected Executor executor;
+    protected long defaultTimeToIdle;
+    protected long defaultTimeToLive;
 
     /**
@@ -84 +84 @@
      * {@link Executor}
      */
-    Principal asroot;
-    SessionContext sc;
+    protected Principal asroot;
+    protected SessionContext sc;
 
     // ~ Injectors
@@ -155 +155 @@
             SessionContext context = cache.getSessionContext(credentials);
             if (context != null) {
+                context.increment();
                 return context.getSession(); // EARLY EXIT!
             }
@@ -161 +162 @@
         }
 
-        boolean ok = executeCheckPassword(_principal, credentials);
+        // Though trusted values, if we receive a null principal, not ok;
+        boolean ok = _principal == null ? false : executeCheckPassword(
+                _principal, credentials);
 
         if (!ok) {
@@ -179 +182 @@
                     .getName());
             if (context != null) {
+                context.increment();
                 return context.getSession(); // EARLY EXIT!
             }
@@ -205 +209 @@
             throw re;
         }
+
+        // All successful, increment and return.
+        ctx.increment();
         return session;
     }
@@ -294 +301 @@
     }
 
+    public int getReferenceCount(String uuid) {
+        SessionContext ctx = cache.getSessionContext(uuid);
+        return ctx.refCount();
+    }
+
+    public int detach(String uuid) {
+        SessionContext ctx = cache.getSessionContext(uuid);
+        return ctx.decrement();
+    }
+
     /*
      */
@@ -302 +319 @@
             ctx = cache.getSessionContext(uuid);
         } catch (SessionException se) {
-            ctx = null;
-        }
-
-        if (ctx == null) {
-            return;
-        }
-
-        Session s = ctx.getSession();
-        s.setClosed(new Timestamp(System.currentTimeMillis()));
-        update(s);
-
-        try {
-            context.publishEvent(new DestroySessionMessage(this, s.getUuid()));
-        } catch (RuntimeException re) {
-            log.warn("Session destruction cancelled by event listener", re);
-            throw re;
-        }
-        // This the publishEvent returns successfully, then we update our cache
-        // since ehcache is not tx-friendly.
-        cache.removeSession(uuid);
+            return; // EARLY EXIT!
+        }
+
+        int refCount = ctx.decrement();
+        if (refCount < 1) {
+
+            Session s = ctx.getSession();
+            s.setClosed(new Timestamp(System.currentTimeMillis()));
+            update(s);
+
+            try {
+                context.publishEvent(new DestroySessionMessage(this, s
+                        .getUuid()));
+            } catch (RuntimeException re) {
+                log.warn("Session destruction cancelled by event listener", re);
+                throw re;
+            }
+            // This the publishEvent returns successfully, then we update our
+            // cache
+            // since ehcache is not tx-friendly.
+            cache.removeSession(uuid);
+        }
     }