Skip to content

Attempt to fix Windows file locking bug #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbranyen merged 12 commits into from
Feb 26, 2015
Merged

Attempt to fix Windows file locking bug #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
749826c
Attempt to fix Windows file locking bug
tbranyen Feb 25, 2015
aea1ae7
Change to a single clone path
tbranyen Feb 25, 2015
0e80c58
Ensure gc exists
tbranyen Feb 25, 2015
be57dcb
Trying to fix issue
tbranyen Feb 25, 2015
7eb2108
Add ClearValue method to structs and classes
Feb 25, 2015
98119a6
Cleanup repo after each clone test
Feb 25, 2015
9141d59
Add unique directories to each clone test
Feb 25, 2015
762fdf3
Fix null ref error in beforeEach
Feb 25, 2015
90d580a
Fix test var null ref
Feb 25, 2015
796c09f
Add repo from git clone to test instance so it can be cleaned up
Feb 25, 2015
e19e8ea
Added global `afterEach`, standardized repo attach
tbranyen Feb 25, 2015
342b6e6
Converted to `beforeEach` for all tests
tbranyen Feb 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Trying to fix issue
  • Loading branch information
@tbranyen
tbranyen authored and John Haley committed Feb 26, 2015
commit be57dcb67ad4a0fc24b4b5041469f1796324868e
2 changes: 1 addition & 1 deletion generate/scripts/generateNativeCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ module.exports = function generateNativeCode() {
});
}
})
});
}).catch(console.log);

};

Expand Down
13 changes: 13 additions & 0 deletions generate/templates/partials/sync_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {

{%each args|argsInfo as arg %}
{%endeach%}

{%-- Inside a free call, if the value is already free'd don't do it again.--%}
{% if cppFunctionName == "Free" %}
if (ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue() != NULL) {
{% endif %}

{%if .|hasReturns %}
{{ return.cType }} result = {%endif%}{{ cFunctionName }}(
{%each args|argsInfo as arg %}
Expand Down Expand Up @@ -67,6 +73,13 @@ from_{{ arg.name }}
}
{%endif%}

{% if cppFunctionName == "Free" %}
// FIXME Stuck here unable to NULL out this->repo
// ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->SetValue(NULL);
}
{% endif %}


{%each args|argsInfo as arg %}
{%if arg | isOid %}
if (args[{{ arg.jsArg }}]->IsString()) {
Expand Down
1 change: 1 addition & 0 deletions generate/templates/templates/class_content.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ using namespace node;
{% if freeFunctionName %}
if (this->selfFreeing) {
{{ freeFunctionName }}(this->raw);
this->raw = NULL;
}
{% endif %}

Expand Down
6 changes: 5 additions & 1 deletion test/tests/clone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ describe("Clone", function() {
this.timeout(30000);

beforeEach(function() {
return fse.remove(clonePath);
return fse.remove(clonePath).catch(function(err) {
console.log(err);

throw err;
});
});

afterEach(function(done) {
Expand Down