1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix: watchFile, unwatch, watch causes error

Browse Source 
Fixed bug that caused application to cast a "TypeError: Cannot call method
'addListener' of undefined" when first watching a file, unwatching and then
watching same file again.
This commit is contained in:
Johan Dahlberg 2010-03-30 15:27:23 +02:00 committed by Ryan Dahl
parent aec80d47bb
commit 18de108e4c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fs.js
View File

@ -319,7 +319,7 @@ exports.watchFile = function (filename) {
if (options.persistent === undefined) options.persistent = true; if (options.persistent === undefined) options.persistent = true;
if (options.interval === undefined) options.interval = 0; if (options.interval === undefined) options.interval = 0;
if (filename in statWatchers) { if (statWatchers[filename]) {
stat = statWatchers[filename]; stat = statWatchers[filename];
} else { } else {
statWatchers[filename] = new fs.StatWatcher(); statWatchers[filename] = new fs.StatWatcher();
@ -331,7 +331,7 @@ exports.watchFile = function (filename) {
}; };
exports.unwatchFile = function (filename) { exports.unwatchFile = function (filename) {
if (filename in statWatchers) { if (statWatchers[filename]) {
stat = statWatchers[filename]; stat = statWatchers[filename];
stat.stop(); stat.stop();
statWatchers[filename] = undefined; statWatchers[filename] = undefined;

18
test/pummel/test-watch-file.js
View File

@ -9,12 +9,18 @@ var f2 = path.join(fixturesDir, "x2.txt");
puts("watching for changes of " + f); puts("watching for changes of " + f);
var changes = 0; var changes = 0;
fs.watchFile(f, function (curr, prev) { function watchFile () {
puts(f + " change"); fs.watchFile(f, function (curr, prev) {
changes++; puts(f + " change");
assert.ok(curr.mtime != prev.mtime); changes++;
fs.unwatchFile(f); assert.ok(curr.mtime != prev.mtime);
}); fs.unwatchFile(f);
watchFile();
fs.unwatchFile(f);
});
}
watchFile();
var fd = fs.openSync(f, "w+"); var fd = fs.openSync(f, "w+");