Bug 332139 - Remove comment from nsJAR::Extract. r=glandium
authorCykesiopka <cykesiopka.bmo@gmail.com>
Tue, 20 Aug 2013 08:30:25 -0400
changeset 156131 ce9839537560330cd91c37fa776c9e81140edd11
parent 156130 e7f398a716bc3bf8f0e316c5dd8adaadeda5cf91
child 156132 6a352c5e6bce33d1f3bd0b6a37b23048c4a002d5
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs332139
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 332139 - Remove comment from nsJAR::Extract. r=glandium
modules/libjar/nsJAR.cpp
--- a/modules/libjar/nsJAR.cpp
+++ b/modules/libjar/nsJAR.cpp
@@ -218,21 +218,16 @@ nsJAR::Extract(const nsACString &aEntryN
 
   nsZipItem *item = mZip->GetItem(PromiseFlatCString(aEntryName).get());
   NS_ENSURE_TRUE(item, NS_ERROR_FILE_TARGET_DOES_NOT_EXIST);
 
   // Remove existing file or directory so we set permissions correctly.
   // If it's a directory that already exists and contains files, throw
   // an exception and return.
 
-  //XXX Bug 332139:
-  //XXX If we guarantee that rv in the case of a non-empty directory
-  //XXX is always FILE_DIR_NOT_EMPTY, we can remove
-  //XXX |rv == NS_ERROR_FAILURE| - bug 322183 needs to be completely
-  //XXX fixed before that can happen
   nsresult rv = outFile->Remove(false);
   if (rv == NS_ERROR_FILE_DIR_NOT_EMPTY ||
       rv == NS_ERROR_FAILURE)
     return rv;
 
   if (item->IsDirectory())
   {
     rv = outFile->Create(nsIFile::DIRECTORY_TYPE, item->Mode());