[
https://issues.apache.org/jira/browse/THRIFT-2205?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13866926#comment-13866926
]
Pierre Lamot commented on THRIFT-2205:
--------------------------------------
@randy:
I did a fresh clone of the repo and tried apply your patch:
{code}
$> git clone http://git-wip-us.apache.org/repos/asf/thrift.git
$> cd thrift
$> wget
https://issues.apache.org/jira/secure/attachment/12621912/0002-repairs-Node-JSON-and-Buffer-and-adds-tests.patch
$> git am 0002-repairs-Node-JSON-and-Buffer-and-adds-tests.patch
...
error: patch failed: lib/nodejs/lib/thrift/transport.js:255
error: lib/nodejs/lib/thrift/transport.js: patch does not apply
Patch failed at 0001 repairs Node JSON and Buffer and adds tests
...
{code}
I tried to do a git apply instead
{code}
$> git apply 0002-repairs-Node-JSON-and-Buffer-and-adds-tests.patch --reject
...
Checking patch lib/nodejs/lib/thrift/transport.js...
error: while searching for:
return str;
},
readAll: function() {
if (this.readCursor >= this.writeCursor) {
throw new InputBufferUnderrunError();
}
var buf = new Buffer(this.writeCursor - this.readCursor);
this.inBuf.copy(buf, 0, this.readCursor, this.writeCursor);
this.readCursor = this.writeCursor;
return buf;
},
...
error: patch failed: lib/nodejs/lib/thrift/transport.js:255
...
Applying patch lib/nodejs/lib/thrift/transport.js with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
...
{code}
full log here http://paste.debian.net/75277/
Pierre
> Node.js Test Server to support test.js JavaScript Browser test and sundry
> fixes
> -------------------------------------------------------------------------------
>
> Key: THRIFT-2205
> URL: https://issues.apache.org/jira/browse/THRIFT-2205
> Project: Thrift
> Issue Type: Improvement
> Components: JavaScript - Library, Node.js - Library
> Affects Versions: 1.0
> Environment: All
> Reporter: Randy Abernethy
> Assignee: Randy Abernethy
> Priority: Minor
> Labels: node, nodejs
> Attachments: 0002-repairs-Node-JSON-and-Buffer-and-adds-tests.patch
>
>
> Adds lib/nodejs/test/testsvr.js
> This server depends on ThriftTest[.js] and runs clean with test.js in the
> browser.
> Also in this patch:
> Repairs some shortfall in the Node JSON Protocol and transport. Fixes
> overflow on Javascript I64 tests. Improves static_server header output.
--
This message was sent by Atlassian JIRA
(v6.1.5#6160)
