Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Fix 'uncaughtException' for top level exceptions"

This reverts commit 8f8dcf8.
  • Loading branch information...
commit 8a52fb7aebcde0baa5682a19cdb1d03dfa63201f 1 parent 8f8dcf8
@ry ry authored
View
6 lib/module.js
@@ -437,11 +437,9 @@ Module.prototype._waitChildrenLoad = function (callback) {
// bootstrap main module.
-exports.runMain = function (filename) {
+exports.runMain = function () {
// Load the main module--the command line argument.
process.mainModule = new Module(".");
- process.mainModule.load(filename, function (err) {
- if (err) throw err;
- });
+ process.mainModule.loadSync(process.argv[1]);
}
View
5 src/node.cc
@@ -1805,8 +1805,9 @@ static void Load(int argc, char *argv[]) {
f->Call(global, 1, args);
- if (try_catch.HasCaught()) {
- FatalException(try_catch);
+ if (try_catch.HasCaught()) {
+ ReportException(try_catch, true);
+ exit(11);
}
}
View
2  src/node.js
@@ -239,7 +239,7 @@ if (process.argv[1]) {
process.argv[1] = path.join(cwd, process.argv[1]);
}
- module.runMain(process.argv[1]);
+ module.runMain();
} else {
// No arguments, run the repl
var repl = module.requireNative('repl');
View
8 test/simple/test-error-reporting.js
@@ -33,14 +33,14 @@ errExec('throws_error.js', function (err, stdout, stderr) {
});
-// Trying to JSON.parse(undefined) in nextTick
-errExec('throws_error3.js', function (err, stdout, stderr) {
+// Trying to JSON.parse(undefined)
+errExec('throws_error2.js', function (err, stdout, stderr) {
assert.ok(/JSON/.test(stderr));
});
-// Trying to JSON.parse(undefined)
-errExec('throws_error2.js', function (err, stdout, stderr) {
+// Trying to JSON.parse(undefined) in nextTick
+errExec('throws_error3.js', function (err, stdout, stderr) {
assert.ok(/JSON/.test(stderr));
});
View
13 test/simple/test-uncaught-exception.js
@@ -1,13 +0,0 @@
-require('../common')
-
-process.addListener('uncaughtException', function (err) {
- puts('Caught exception: ' + err);
-});
-
-setTimeout(function () {
- puts('This will still run.');
-}, 500);
-
-// Intentionally cause an exception, but don't catch it.
-nonexistentFunc();
-puts('This will not run.');
Please sign in to comment.
Something went wrong with that request. Please try again.