From: Christos KK Loverdos <loverdos@gmail.com>
Date: Fri, 14 Sep 2012 13:35:38 +0000 (+0300)
Subject: Remove checks for latest events
X-Git-Url: https://code.grnet.gr/git/aquarium/commitdiff_plain/b41c51e7a80f4c51cc99dbb3a8faf4104b108a18

Remove checks for latest events
---

diff --git a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index 9cbe766..0c1cbb6 100644
--- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@ -265,22 +265,9 @@ class UserActor extends ReflectiveRoleableActor {
     val hadUserCreationIMEvent = haveUserCreationIMEvent
 
     if(!haveAgreements) {
-      // This IMEvent has arrived after any ResourceEvents
-      INFO("Arrived after any ResourceEvent: %s", imEvent)
       initializeStateOfIMEvents()
     }
     else {
-      if(this._latestIMEventOriginalID == imEvent.getOriginalID) {
-        // This happens when the actor is brought to life, then immediately initialized, and then
-        // sent the first IM event. But from the initialization procedure, this IM event will have
-        // already been loaded from DB!
-        INFO("Ignoring first %s", imEvent)
-        logSeparator()
-
-        //this._latestIMEventID = imEvent.id
-        return
-      }
-
       updateAgreementHistoryFrom(imEvent)
       updateLatestIMEventIDFrom(imEvent)
     }
@@ -312,21 +299,6 @@ class UserActor extends ReflectiveRoleableActor {
       return
     }
 
-    if(this._rcMsgCount == 0) {
-      // First rcEvent
-    }
-
-    // Since the latest resource event per resource is recorded in the user state,
-    // we do not need to query the store. Just query the in-memory state.
-    // Note: This is a similar situation with the first IMEvent received right after the user
-    //       actor is created.
-    if(this._latestResourceEventOriginalID == rcEvent.getOriginalID) {
-      INFO("Ignoring first %s", AvroHelpers.jsonStringOfSpecificRecord(rcEvent))
-      logSeparator()
-
-      return
-    }
-
     val now = TimeHelpers.nowMillis()
     // TODO: Review this and its usage in user state.
     // TODO: The assumption is that the resource set increases all the time,