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

addresses #1773, RDF read from disk works once, fails after

Browse source 
This fixes some issues with streams being closed due to overzealous garbage collection in Firefox 3.6. I'm not sure if this is the same as #1773 or not, but it certainly produces export errors.
This commit is contained in:
Simon Kornblith 2011-02-02 05:42:16 +00:00
parent dc86b67743
commit a9132a2be2
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,6 +100,13 @@ Zotero.Translate.SandboxManager.prototype = {
} }
} }
/**
* This variable holds a reference to all open nsIInputStreams and nsIOutputStreams in the global
* scope at all times. Otherwise, our streams might get garbage collected when we allow other code
* to run during Zotero.wait().
*/
Zotero.Translate.IO.streamsToKeepOpen = [];
/******* (Native) Read support *******/ /******* (Native) Read support *******/
Zotero.Translate.IO.Read = function(file, mode) { Zotero.Translate.IO.Read = function(file, mode) {
@ -108,6 +115,7 @@ Zotero.Translate.IO.Read = function(file, mode) {
// open file // open file
this._rawStream = Components.classes["@mozilla.org/network/file-input-stream;1"] this._rawStream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream); .createInstance(Components.interfaces.nsIFileInputStream);
Zotero.Translate.IO.streamsToKeepOpen.push(this._rawStream);
this._rawStream.init(file, 0x01, 0664, 0); this._rawStream.init(file, 0x01, 0664, 0);
// start detecting charset // start detecting charset
@ -290,9 +298,7 @@ Zotero.Translate.IO.Read.prototype = {
// seek back to the beginning // seek back to the beginning
this._seekToStart(); this._seekToStart();
if(this._allowCharsetOverride) { if(this._allowCharsetOverride) {
this.inputStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
.createInstance(Components.interfaces.nsIConverterInputStream);
try { try {
this.inputStream.init(this._rawStream, charset, 65535, this.inputStream.init(this._rawStream, charset, 65535,
Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER); Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
@ -333,8 +339,12 @@ Zotero.Translate.IO.Read.prototype = {
"reset":function(newMode) { "reset":function(newMode) {
this._seekToStart(); this._seekToStart();
this.inputStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
.createInstance(Components.interfaces.nsIConverterInputStream); if(!this.inputStream) {
this.inputStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
.createInstance(Components.interfaces.nsIConverterInputStream);
Zotero.Translate.IO.streamsToKeepOpen.push(this.inputStream);
}
this.inputStream.init(this._rawStream, this._charset, 65535, this.inputStream.init(this._rawStream, this._charset, 65535,
Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER); Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
@ -345,7 +355,12 @@ Zotero.Translate.IO.Read.prototype = {
}, },
"close":function() { "close":function() {
this.inputStream.close(); Zotero.Translate.IO.streamsToKeepOpen.splice(Zotero.Translate.IO.streamsToKeepOpen.indexOf(this._rawStream), 1);
if(this.inputStream) {
Zotero.Translate.IO.streamsToKeepOpen.splice(Zotero.Translate.IO.streamsToKeepOpen.indexOf(this.inputStream), 1);
}
this._rawStream.close();
} }
} }
@ -354,6 +369,7 @@ Zotero.Translate.IO.Read.prototype = {
Zotero.Translate.IO.Write = function(file, mode, charset) { Zotero.Translate.IO.Write = function(file, mode, charset) {
this._rawStream = Components.classes["@mozilla.org/network/file-output-stream;1"] this._rawStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
.createInstance(Components.interfaces.nsIFileOutputStream); .createInstance(Components.interfaces.nsIFileOutputStream);
Zotero.Translate.IO.streamsToKeepOpen.push(this._rawStream);
this._rawStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate this._rawStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
this._writtenToStream = false; this._writtenToStream = false;
if(mode || charset) this.reset(mode, charset); if(mode || charset) this.reset(mode, charset);
@ -377,8 +393,12 @@ Zotero.Translate.IO.Write.prototype = {
throw "Translate: setCharacterSet: charset must be a string"; throw "Translate: setCharacterSet: charset must be a string";
} }
this.outputStream = Components.classes["@mozilla.org/intl/converter-output-stream;1"] if(!this.outputStream) {
.createInstance(Components.interfaces.nsIConverterOutputStream); this.outputStream = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
.createInstance(Components.interfaces.nsIConverterOutputStream);
Zotero.Translate.IO.streamsToKeepOpen.push(this.outputStream);
}
if(charset == "UTF-8xBOM") charset = "UTF-8"; if(charset == "UTF-8xBOM") charset = "UTF-8";
this.outputStream.init(this._rawStream, charset, 1024, "?".charCodeAt(0)); this.outputStream.init(this._rawStream, charset, 1024, "?".charCodeAt(0));
this._charset = charset; this._charset = charset;
@ -424,6 +444,12 @@ Zotero.Translate.IO.Write.prototype = {
if(Zotero.Translate.IO.rdfDataModes.indexOf(this._mode) !== -1) { if(Zotero.Translate.IO.rdfDataModes.indexOf(this._mode) !== -1) {
this.write(this.RDF.serialize()); this.write(this.RDF.serialize());
} }
this.outputStream.close();
Zotero.Translate.IO.streamsToKeepOpen.splice(Zotero.Translate.IO.streamsToKeepOpen.indexOf(this._rawStream), 1);
if(this.outputStream) {
Zotero.Translate.IO.streamsToKeepOpen.splice(Zotero.Translate.IO.streamsToKeepOpen.indexOf(this.outputStream), 1);
}
this._rawStream.close();
} }
} }