Merge pull request #131 from Sage/master

clear rows before invoking nextRows callback

Author: joeferner

src/reader.cpp

@@ -119,21 +119,22 @@ void Reader::EIO_AfterNextRows(uv_work_t* req, int status) {
   baton->busy = false;
   baton->connection->Unref();
   // transfer callback to local and dispose persistent handle
-  // must be done before invoking callback because callback may set another callback into baton->callback
   Local<Function> cb = uni::HandleToLocal(uni::Deref(baton->callback));
   baton->callback.Dispose();
   baton->callback.Clear();
 
   Handle<Value> argv[2];
   Connection::handleResult(baton, argv);
-  node::MakeCallback(Context::GetCurrent()->Global(), cb, 2, argv);
-  
+
   baton->ResetRows();
   if (baton->done || baton->error) {
     // free occi resources so that we don't run out of cursors if gc is not fast enough
     // reader destructor will delete the baton and everything else.
     baton->ResetStatement();
   }
   delete req;
+
+  // invoke callback at the very end because callback may re-enter nextRows.
+  node::MakeCallback(Context::GetCurrent()->Global(), cb, 2, argv);
 }