[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit cb9def9f6b59fb2b3e95783fe50163108f13ae38
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 25 20:02:24 2002 +0000

    2002-03-25  Kenneth Kocienda  <kocienda at apple.com>
    
            Disk cache now has accessor for path on disk
    
            * CacheLoader.subproj/IFURLDiskCache.h:
            * CacheLoader.subproj/IFURLDiskCache.m: (-[IFURLDiskCache path]):
    
            Fixed bug introduced in lazy cache code. This simple typo quite effectively
            prevented data from being written out to disk.
    
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase setObject:forKey:]),
            (-[IFURLFileDatabase objectForKey:]), (-[IFURLFileDatabase
            performSetObject:forKey:]):
            * WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index c640966..5d92e39 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -196,7 +196,7 @@ enum
     [mutex lock];
     
     [setCache setObject:object forKey:key];
-    op = [[IFURLFileDatabaseOp alloc] initWithCode:IFURLFileDatabaseSetObjectOp key:key object:nil];
+    op = [[IFURLFileDatabaseOp alloc] initWithCode:IFURLFileDatabaseSetObjectOp key:key object:object];
     [ops addObject:op];
     [self setTimer];
     
@@ -264,9 +264,11 @@ enum
 
     // go to disk
     filePath = [NSString stringWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
-    
-    data = [[NSData alloc] initWithContentsOfMappedFile:filePath];
 
+    data = [[NSData alloc] initWithContentsOfMappedFile:filePath];
+    if (!data) {
+        data = [[NSData alloc] initWithContentsOfFile:filePath];
+    }
     if (data) {
         unarchiver = [[NSUnarchiver alloc] initForReadingWithData:data];
         fileKey = [unarchiver decodeObject];
@@ -301,7 +303,7 @@ enum
     NSFileManager *defaultManager;
 
 #ifdef WEBFOUNDATION_DEBUG
-    WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performSetObject - %@", key);
+    WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performSetObject - %@ - %@", key, [IFURLFileDatabase uniqueFilePathForKey:key]);
 #endif
 
     result = NO;

-- 
WebKit Debian packaging