Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
Conflicts:
lib/nodejs/lib/thrift/static_server.js
diff --git a/lib/nodejs/lib/thrift/static_server.js b/lib/nodejs/lib/thrift/static_server.js
index 1627328..a1d2eaa 100644
--- a/lib/nodejs/lib/thrift/static_server.js
+++ b/lib/nodejs/lib/thrift/static_server.js
@@ -113,8 +113,8 @@
//Locate the file requested
var uri = url.parse(request.url).pathname;
var filename = path.join(baseDir, uri);
- fs.exists(filename, function(exists) {
- if(!exists) {
+ path.exists(filename, function(exists) {
+ if (!exists) {
response.writeHead(404);
response.end();
return;
@@ -125,7 +125,7 @@
}
fs.readFile(filename, "binary", function(err, file) {
- if(err) {
+ if (err) {
response.writeHead(500);
response.end(err + "\n");
return;