Changeset 1672

Timestamp:

06/25/07 23:14:32 (18 months ago)

Author:

jmoore

Message:

#740 Fixing event context loading re: stateful sessions.

Location:

branches/3.0-Beta2/components/server/src/ome/security/basic

Files:

• BasicSecuritySystem.java (modified) (5 diffs)
• EventHandler.java (modified) (3 diffs)

branches/3.0-Beta2/components/server/src/ome/security/basic/BasicSecuritySystem.java

@@ -948 +948 @@
     // =========================================================================
 
-    public void loadEventContext(boolean isReadyOnly) {
+    public void loadEventContext(boolean isReadOnly) {
 
         // needed services
@@ -958 +958 @@
 
         // start refilling current details
-        cd.setReadOnly(isReadyOnly);
+        cd.setReadOnly(isReadOnly);
 
         // Experimenter
@@ -997 +997 @@
         cd.newEvent(type, token);
 
-        Event event = getCurrentEvent();
-        event.getGraphHolder().setToken(token, token);
-
-        // If this event is not read only, then lets save this event to prevent
-        // flushing issues later.
-        if (!isReadyOnly) {
+        if (!isReadOnly) {   
+            saveEventIfWriteMethod();
+        }
+        
+    }
+
+    /** During {@link #loadEventContext(boolean) loading} and 
+     * {@link #setEventContext(EventContext) setting} of the {@link EventContext}
+     * it is necessary to save the {@link Event} to prevent "null or transient
+     * value exceptions" later. This is done also done for {@link Event events}
+     * of stateful services, in which the {@link EventContext#isReadOnly()} flag
+     * changes from true to false.
+     * 
+     * @see EventHandler
+     * @see #loadEventContext(boolean)
+     * @see #setEventContext(EventContext)
+     */
+    private void saveEventIfWriteMethod() {
+            IUpdate iUpdate = sf.getUpdateService();
+            Event event = getCurrentEvent();
+            event.getGraphHolder().setToken(token, token);
             setCurrentEvent(iUpdate.saveAndReturnObject(event));
-        }
-
     }
 
@@ -1027 +1040 @@
                 && p.getEventType().equals(t_name)) {
             cd.setCurrentEventContext(bec);
+            if (!bec.isReadOnly) {
+                saveEventIfWriteMethod();
+            }
         }
 
@@ -1119 +1135 @@
         if (Event.class.isAssignableFrom(klass)
                 || EventLog.class.isAssignableFrom(klass)) {
-            log.debug("Not logging creation of logging type:" + klass);
+            // Cannot log because these are the log classes.
+            log.info("Noticing:" + action + "," + klass + "," + id);
         }
 

branches/3.0-Beta2/components/server/src/ome/security/basic/EventHandler.java

@@ -88 +88 @@
     /**
      * invocation interceptor for prepairing this {@link Thread} for execution
-     * and subsequently reseting it.
+     * and subsequently reseting it. 
      * 
      * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
@@ -108 +108 @@
 
                 else {
-                    secSys.loadEventContext(false);
+                    secSys.loadEventContext(readOnly);
                     objCtxMap.put(arg0.getThis(), secSys.getEventContext());
                     prevCtx = secSys.getEventContext();
@@ -114 +114 @@
                 }
             }
+            // Need to update the read-ability
+            ((BasicEventContext)prevCtx).isReadOnly = readOnly;
             secSys.setEventContext(prevCtx);
         }