--- versionedFile/extVersionedFile.py	2009/06/21 11:28:55	1.32
+++ versionedFile/extVersionedFile.py	2009/08/31 14:07:35	1.34
@@ -530,9 +530,12 @@ class extVersionedFileFolder(Folder,ECHO
         vf = self._newVersionedFile(id,title=id)
         logging.error("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self)))
         # add its content (and don't index)
+        self._setObject(id,vf)
+        vf=getattr(self,id)
+
         obj=vf.addContentObject(id,vC,author=author,file=file,content_type=content_type,from_tmp=isRealFile,index=False)
         # add file to this folder (this should do the indexing)
-        self._setObject(id,vf)
+        #self._setObject(id,vf)
         
         try:
             self.REQUEST.SESSION['objID']=vf.getId()
@@ -1116,11 +1119,12 @@ class extVersionedFile(CatalogAware,Fold
         """unlock"""
         if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]:
             self.lockedBy=''
-            self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER'],)
+            RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])
         else:
             return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER'])
         
     
+
     def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None):
         """factory for content objects. to be overridden in derived classes."""
         return extVersionedFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author)