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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 80498d837505af8a6c79e620019a4823f40ad59b
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 03:19:31 2003 +0000

    	Removing ERROR() that isn't an error, left over from the Safari-48 download firedrill.
    
            Reviewed by Chris.
    
            * Downloads.subproj/WebDownloadHandler.m:
            (-[WebDownloadHandler cleanUpAfterFailure]):  Don't ERROR if we are asked to cleanup
    	a file and there is nothing to cleanup.  This can happen in the rare case of the
    	download being canceled before the first byte arrives, and we deal properly, no ERROR.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8f15c10..e297f35 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-28  Trey Matteson  <trey at apple.com>
+
+	Removing ERROR() that isn't an error, left over from the Safari-48 download firedrill.
+
+        Reviewed by Chris.
+
+        * Downloads.subproj/WebDownloadHandler.m:
+        (-[WebDownloadHandler cleanUpAfterFailure]):  Don't ERROR if we are asked to cleanup
+	a file and there is nothing to cleanup.  This can happen in the rare case of the
+	download being canceled before the first byte arrives, and we deal properly, no ERROR.
+
 2003-01-28  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3150856 - crash with full-size plugins in frame or iframe
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index bd8a47c..f120e14 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -133,9 +133,11 @@
 
 - (void)cleanUpAfterFailure
 {
+    // VERY IMPORTANT TEST.  Only cleanup if we have opened a file, since the downloadPath
+    // might be an existing file that we haven't discovered that we conflict with.  This can
+    // happen if we're cleaning up after we received the first response, but before the first
+    // data was processed.
     if (fileRefPtr) {
-        // Only cleanup if we have opened a file, since the downloadPath might be an existing
-        // file that we haven't discovered that we conflict with
         NSString *path = [dataSource downloadPath];
 
         [self closeFile];
@@ -152,8 +154,6 @@
             // Note we currently don't support downloading directories, so we know this is wrong
             ERROR("Download file is a directory - will not be removed");
         }
-    } else {
-        ERROR("Was about to remove a non-download file");
     }
 }
 
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index bd8a47c..f120e14 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -133,9 +133,11 @@
 
 - (void)cleanUpAfterFailure
 {
+    // VERY IMPORTANT TEST.  Only cleanup if we have opened a file, since the downloadPath
+    // might be an existing file that we haven't discovered that we conflict with.  This can
+    // happen if we're cleaning up after we received the first response, but before the first
+    // data was processed.
     if (fileRefPtr) {
-        // Only cleanup if we have opened a file, since the downloadPath might be an existing
-        // file that we haven't discovered that we conflict with
         NSString *path = [dataSource downloadPath];
 
         [self closeFile];
@@ -152,8 +154,6 @@
             // Note we currently don't support downloading directories, so we know this is wrong
             ERROR("Download file is a directory - will not be removed");
         }
-    } else {
-        ERROR("Was about to remove a non-download file");
     }
 }
 

-- 
WebKit Debian packaging