mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Properly close files following detection

Browse source
This commit is contained in:
Simon Kornblith 2011-03-01 21:41:13 +00:00
parent ebd7df3862
commit a41841eb2b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/translation/browser_firefox.js
View file

@ -143,9 +143,7 @@ Zotero.Translate.IO.Read = function(file, mode) {
this.file = file; this.file = file;
// open file // open file
this._rawStream = Components.classes["@mozilla.org/network/file-input-stream;1"] this._openRawStream();
.createInstance(Components.interfaces.nsIFileInputStream);
this._rawStream.init(file, 0x01, 0664, 0);
// start detecting charset // start detecting charset
var charset = null; var charset = null;
@ -297,7 +295,7 @@ Zotero.Translate.IO.Read.prototype = {
}, },
"_seekToStart":function(charset) { "_seekToStart":function(charset) {
this._rawStream.close(); if(this._rawStream) this._rawStream.close();
this._openRawStream(); this._openRawStream();
this._linesExhausted = false; this._linesExhausted = false;
@ -398,6 +396,7 @@ Zotero.Translate.IO.Read.prototype = {
if(myIndex !== -1) Zotero.Translate.IO.maintainedInstances.splice(myIndex, 1); if(myIndex !== -1) Zotero.Translate.IO.maintainedInstances.splice(myIndex, 1);
this._rawStream.close(); this._rawStream.close();
delete this._rawStream;
} }
} }
Zotero.Translate.IO.Read.prototype.__defineGetter__("contentLength", Zotero.Translate.IO.Read.prototype.__defineGetter__("contentLength",

2
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -1068,7 +1068,7 @@ Zotero.Translate.Import.prototype.setString = function(string) {
* Overload {@link Zotero.Translate.Base#complete} to close file * Overload {@link Zotero.Translate.Base#complete} to close file
*/ */
Zotero.Translate.Import.prototype.complete = function(returnValue, error) { Zotero.Translate.Import.prototype.complete = function(returnValue, error) {
if(this._currentState == "translate" && this._io) { if(this._io) {
this._progress = null; this._progress = null;
this._io.close(); this._io.close();
} }