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

Fix race condition under Firefox 4

Browse source
This commit is contained in:
Simon Kornblith 2011-06-14 04:02:27 +00:00
parent 2b68113fd7
commit 40e0c6fee6
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/ipc.js
View file

@ -320,6 +320,7 @@ Zotero.IPC.Pipe = new function() {
* deletes it
*/
this.writeShutdownMessage = function(file) {
Zotero.debug("IPC: Closing pipe "+file.path);
var oStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
getService(Components.interfaces.nsIFileOutputStream);
oStream.init(file, 0x02 | 0x10, 0, 0);
@ -327,7 +328,6 @@ Zotero.IPC.Pipe = new function() {
oStream.write(cmd, cmd.length);
oStream.close();
file.remove(false);
Zotero.debug("IPC: Closing pipe "+file.path);
}
}
@ -405,7 +405,14 @@ Zotero.IPC.Pipe.WorkerThread = function(file, callback) {
worker.postMessage({"path":file.path, "libc":Zotero.IPC.getLibcPath()});
// add shutdown listener
Zotero.addShutdownListener(Zotero.IPC.Pipe.writeShutdownMessage.bind(null, file));
Zotero.addShutdownListener(function() {
// wait for pending events to complete (so that we don't try to close the pipe before it
// finishes opening)
while(Zotero.mainThread.processNextEvent(false)) {};
// close pipe
Zotero.IPC.Pipe.writeShutdownMessage(file)
});
}
Zotero.IPC.Pipe.WorkerThread.prototype = {