Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
Sean McKenna
2014-04-28 10:10:21 -06:00
19 changed files with 350 additions and 147 deletions

View File

@@ -678,7 +678,9 @@ public class Runner implements MessageConsumer {
for (Event event : eventSet) {
// System.out.println("EventThread.handleEvent -> " + event);
if (event instanceof ExceptionEvent) {
if (event instanceof VMStartEvent) {
vm.resume();
} else if (event instanceof ExceptionEvent) {
// for (ThreadReference thread : vm.allThreads()) {
// System.out.println("thread : " + thread);
//// thread.suspend();
@@ -710,8 +712,6 @@ public class Runner implements MessageConsumer {
errThread.start();
outThread.start();
vm.resume();
// Shutdown begins when event thread terminates
try {
if (eventThread != null) eventThread.join(); // is this the problem?