Update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2012-02-05 13:23:53 +01:00
parent 36f43fa676
commit 6c1eafe00e
2 changed files with 7 additions and 5 deletions

View File

@ -1,6 +1,6 @@
## 0.9.6 (unreleased) ## 0.9.6 (unreleased)
- Fix strange issue with inconsistent childprocess reads on JRuby. [GH-711]
## 0.9.5 (February 5, 2012) ## 0.9.5 (February 5, 2012)

View File

@ -116,10 +116,6 @@ module Vagrant
rescue ChildProcess::TimeoutError rescue ChildProcess::TimeoutError
raise TimeoutExceeded, process.pid raise TimeoutExceeded, process.pid
end end
# Close the writer pipes, since we're just reading
stdout_writer.close
stderr_writer.close
@logger.debug("Exit status: #{process.exit_code}") @logger.debug("Exit status: #{process.exit_code}")
@ -140,6 +136,12 @@ module Vagrant
yield io_name, extra_data if block_given? yield io_name, extra_data if block_given?
end end
# Close the writer pipes. Note that we do this so late (after the process
# has quit) to work around an issue with childprocess and JRuby. It is
# bizarre but it works.
stdout_writer.close
stderr_writer.close
# Return an exit status container # Return an exit status container
return Result.new(process.exit_code, io_data[:stdout], io_data[:stderr]) return Result.new(process.exit_code, io_data[:stdout], io_data[:stderr])
end end