You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by vd...@apache.org on 2009/11/29 14:30:11 UTC

svn commit: r885222 - /incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Author: vdichev
Date: Sun Nov 29 13:30:10 2009
New Revision: 885222

URL: http://svn.apache.org/viewvc?rev=885222&view=rev
Log:
Performance improvements for cached messages in pools.

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=885222&r1=885221&r2=885222&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sun Nov 29 13:30:10 2009
@@ -71,11 +71,14 @@
     val (r1, left) = il.foldLeft[(Map[Long, Message], List[Long])](
       (Map.empty, Nil)) {
       case ((map, left), id) =>
-        if (idCache.contains(id) && (!user.isDefined || 
-                                     !idCache(id).pool.defined_? ||
-                                     Privilege.findViewablePools(user.get.id.is).
-                                               contains(idCache(id).pool.is))) {
-          (map + (id -> idCache(id)), left)
+        if (idCache.contains(id)) {
+          if (!user.isDefined || 
+              !idCache(id).pool.defined_? ||
+              Privilege.findViewablePools(user.get.id.is).
+                        contains(idCache(id).pool.is)) {
+            (map + (id -> idCache(id)), left)
+          } else
+            (map, left)
         } else (map, id :: left)
     }