Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 57524 invoked from network); 20 Mar 2010 19:01:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Mar 2010 19:01:27 -0000 Received: (qmail 88601 invoked by uid 500); 20 Mar 2010 19:01:27 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 88569 invoked by uid 500); 20 Mar 2010 19:01:27 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 88556 invoked by uid 99); 20 Mar 2010 19:01:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Mar 2010 19:01:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Mar 2010 19:01:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2AD5723888CE; Sat, 20 Mar 2010 19:01:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r925659 - /incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Date: Sat, 20 Mar 2010 19:01:03 -0000 To: esme-commits@incubator.apache.org From: esjewett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100320190103.2AD5723888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: esjewett Date: Sat Mar 20 19:01:02 2010 New Revision: 925659 URL: http://svn.apache.org/viewvc?rev=925659&view=rev Log: [ESME-184] Stops putting non-messages into mailboxes and notifying listeners, which was pushing real messages out of the user timeline Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=925659&r1=925658&r2=925659&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Sat Mar 20 19:01:02 2010 @@ -246,9 +246,11 @@ class UserActor extends LiftActor { mb.saveMe Stats incr "messagesDelivered" - _mailbox = ((msg.id.is, reason, false) :: _mailbox.toList).take(500).toArray - - listeners.foreach(_ ! MessageReceived(msg, reason)) + // Only add to mailbox and notify listeners if there is a real message involved + if(msg.id.is != -1) { + _mailbox = ((msg.id.is, reason, false) :: _mailbox.toList).take(500).toArray + listeners.foreach(_ ! MessageReceived(msg, reason)) + } toDo.foreach { td => @@ -268,7 +270,8 @@ class UserActor extends LiftActor { Distributor ! Distributor.AddMessageToMailbox(id, msg, ResendReason(userId)) - case FetchFeed(_, _) => MessagePullActor ! MessagePullActor.Fetch(td.performId) + case FetchFeed(_, _) => + MessagePullActor ! MessagePullActor.Fetch(td.performId) case ScalaInterpret => logger.info("Scala interpreter is disabled!") /*if (msg.source.is != "scala")