You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ra...@apache.org on 2014/10/01 02:15:26 UTC
git commit: THRIFT-2751: repair node oneway bug and symlink issue
Client: Node Lib Patch: Randy Abernethy
Repository: thrift
Updated Branches:
refs/heads/master 92a1ed001 -> bd2fce6fa
THRIFT-2751: repair node oneway bug and symlink issue
Client: Node Lib
Patch: Randy Abernethy
This patch keep npm from creating sym links on npm install.
Sym links fail when writting to some shared volumes.
Also fixes multiplex oneway bug in nodejs
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bd2fce6f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bd2fce6f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bd2fce6f
Branch: refs/heads/master
Commit: bd2fce6fa3beda151da1f09ea62b4925c8784bbe
Parents: 92a1ed0
Author: Randy Abernethy <ra...@apache.org>
Authored: Tue Sep 30 17:12:27 2014 -0700
Committer: Randy Abernethy <ra...@apache.org>
Committed: Tue Sep 30 17:12:27 2014 -0700
----------------------------------------------------------------------
lib/nodejs/Makefile.am | 2 +-
lib/nodejs/lib/thrift/multiplexed_processor.js | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bd2fce6f/lib/nodejs/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am
index bd381bf..3868905 100755
--- a/lib/nodejs/Makefile.am
+++ b/lib/nodejs/Makefile.am
@@ -22,7 +22,7 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift
# $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift
deps: package.json
- $(NPM) install
+ $(NPM) install --no-bin-links
check: deps
$(NPM) test
http://git-wip-us.apache.org/repos/asf/thrift/blob/bd2fce6f/lib/nodejs/lib/thrift/multiplexed_processor.js
----------------------------------------------------------------------
diff --git a/lib/nodejs/lib/thrift/multiplexed_processor.js b/lib/nodejs/lib/thrift/multiplexed_processor.js
index 1aef4c3..fbceb79 100644
--- a/lib/nodejs/lib/thrift/multiplexed_processor.js
+++ b/lib/nodejs/lib/thrift/multiplexed_processor.js
@@ -27,10 +27,8 @@ MultiplexedProcessor.prototype.registerProcessor = function(name, handler) {
};
MultiplexedProcessor.prototype.process = function(inp, out) {
-
var begin = inp.readMessageBegin();
-
- if (begin.mtype != Thrift.MessageType.CALL || begin.mtype == Thrift.MessageType.ONEWAY) {
+ if (begin.mtype != Thrift.MessageType.CALL && begin.mtype != Thrift.MessageType.ONEWAY) {
throw new Thrift.TException("TMultiplexedProcessor: Unexpected message type");
}
@@ -57,5 +55,4 @@ MultiplexedProcessor.prototype.process = function(inp, out) {
};
this.services[sname].process(inpProxy, out);
-
};