From 664aaa0088b97da0224d7637c9248a1dfe72a3c6 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 3 Jan 2014 10:57:04 -0800 Subject: [PATCH] core: raise exceptions if they happen in WaitForCommunicator threads --- lib/vagrant/action/builtin/wait_for_communicator.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/vagrant/action/builtin/wait_for_communicator.rb b/lib/vagrant/action/builtin/wait_for_communicator.rb index fe1e59818..c30127659 100644 --- a/lib/vagrant/action/builtin/wait_for_communicator.rb +++ b/lib/vagrant/action/builtin/wait_for_communicator.rb @@ -56,6 +56,10 @@ module Vagrant return if env[:interrupted] end + # Join so that they can raise exceptions if there were any + ready_thr.join if !ready_thr.alive? + states_thr.join if !states_thr.alive? + # If it went into a bad state, then raise an error if !states_thr[:result] raise Errors::VMBootBadState,