Trying to fix issue

tbranyen · John Haley · commit be57dcb67ad4 · 2015-02-25T17:17:02.000-07:00
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -144,7 +144,7 @@ module.exports = function generateNativeCode() {
         });
       }
     })
-  });
+  }).catch(console.log);
 
 };
 
diff --git a/generate/templates/partials/sync_function.cc b/generate/templates/partials/sync_function.cc
@@ -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 %}
@@ -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()) {
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -35,6 +35,7 @@ using namespace node;
     {% if freeFunctionName %}
       if (this->selfFreeing) {
         {{ freeFunctionName }}(this->raw);
+        this->raw = NULL;
       }
     {% endif %}
 
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ module.exports = function generateNativeCode() {`
`144`	`144`	`});`
`145`	`145`	`}`
`146`	`146`	`})`
`147`		`- });`
	`147`	`+ }).catch(console.log);`
`148`	`148`
`149`	`149`	`};`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ using namespace node;`
`35`	`35`	`{% if freeFunctionName %}`
`36`	`36`	`if (this->selfFreeing) {`
`37`	`37`	`{{ freeFunctionName }}(this->raw);`
	`38`	`+ this->raw = NULL;`
`38`	`39`	`}`
`39`	`40`	`{% endif %}`
`40`	`41`