Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16487

Modified Files:
        objectcache.py 
Log Message:
fix crash when object is None

Index: objectcache.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/objectcache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** objectcache.py      30 Jan 2004 20:40:28 -0000      1.4
--- objectcache.py      4 Feb 2004 17:20:24 -0000       1.5
***************
*** 11,14 ****
--- 11,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.5  2004/02/04 17:20:24  dischi
+ # fix crash when object is None
+ #
  # Revision 1.4  2004/01/30 20:40:28  dischi
  # make key an unicode object to prevent crash
***************
*** 93,96 ****
--- 96,103 ----
              key = unicode(key, config.LOCALE)
  
+         # remove old one if key is already in cache
+         if key in self.cache:
+             del self.lru[self.lru.index(key)]
+             
          # Do we need to delete the oldest item?
          if len(self.cache) > self.cachesize:
***************
*** 99,105 ****
              del self.cache[lru_key]
              del self.lru[0]
          self.cache[key] = object
          self.lru.append(key)
!         
  
      def __delitem__(self, key):
--- 106,113 ----
              del self.cache[lru_key]
              del self.lru[0]
+             
          self.cache[key] = object
          self.lru.append(key)
! 
  
      def __delitem__(self, key):



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to