diff -r 6d8b0bd9402f plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Jan 09 12:54:00 2014 -0500 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Jan 14 10:07:07 2014 +0100 @@ -85,6 +85,10 @@ pthread_mutex_unlock(&debug_pipe_lock); } +void reset_pre_init_messages(){ + pre_jvm_message = std::queue(); + } + /** * Given a context number, constructs a message prefix to send to Java * diff -r 6d8b0bd9402f plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Thu Jan 09 12:54:00 2014 -0500 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jan 14 10:07:07 2014 +0100 @@ -68,6 +68,7 @@ void *flush_pre_init_messages(void* data); void push_pre_init_messages(char * ldm); +void reset_pre_init_messages(); // debugging macro. #define initialize_debug() \ diff -r 6d8b0bd9402f tests/cpp-unit-tests/MemoryLeakDetector.h --- a/tests/cpp-unit-tests/MemoryLeakDetector.h Thu Jan 09 12:54:00 2014 -0500 +++ b/tests/cpp-unit-tests/MemoryLeakDetector.h Tue Jan 14 10:07:07 2014 +0100 @@ -75,6 +75,8 @@ IcedTeaPluginUtilities::clearInstanceIDs(); /* Clears allocations caused by storeObjectMapping */ IcedTeaPluginUtilities::clearObjectMapping(); + /*reset messages*/ + reset_pre_init_messages(); } int initial_cpp_allocations;