Skip to content

Commit

Permalink
2009-09-27 Gonzalo Paniagua Javier <gonzalo@novell.com>
Browse files Browse the repository at this point in the history
	* marshal.c: don't create the handle when calling. It is created later
	if needed.


svn path=/branches/mono-2-6/mono/; revision=142700
  • Loading branch information
gonzalop committed Sep 27, 2009
1 parent 2de8607 commit ef0ea82
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 5 additions & 0 deletions mono/metadata/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2009-09-27 Gonzalo Paniagua Javier <gonzalo@novell.com>

* marshal.c: don't create the handle when calling. It is created later
if needed.

2009-09-24 Zoltan Varga <vargaz@gmail.com>

* marshal.c (emit_ptr_to_object_conv): Generate an exception instead of
Expand Down
5 changes: 1 addition & 4 deletions mono/metadata/marshal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1987,13 +1987,10 @@ mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params)
MonoAsyncResult *ares;
MonoObject *exc;
MonoArray *out_args;
HANDLE handle;
method = delegate->method;

msg = mono_method_call_message_new (mono_marshal_method_from_wrapper (method), params, NULL, &async_callback, &state);
handle = CreateEvent (NULL, TRUE, FALSE, NULL);
g_assert(handle != NULL);
ares = mono_async_result_new (mono_domain_get (), handle, state, handle, NULL);
ares = mono_async_result_new (mono_domain_get (), NULL, state, NULL, NULL);
MONO_OBJECT_SETREF (ares, async_delegate, (MonoObject *)delegate);
MONO_OBJECT_SETREF (ares, async_callback, (MonoObject *)async_callback);
MONO_OBJECT_SETREF (msg, async_result, ares);
Expand Down

0 comments on commit ef0ea82

Please sign in to comment.