Clarify Forker#result

lib/spork/forker.rb

@@ -37,17 +37,18 @@ def initialize(&block)
   #
   # If the fork was aborted, then result returns nil.
   def result
-    return unless running?
+    return @result if defined?(@result) || ! running?
     result_thread = Thread.new do
       begin
         @result = Marshal.load(@server_io)
         Marshal.dump('ACK', @server_io)
-      rescue ForkDiedException, EOFError
+      rescue EOFError
         @result = nil
+      rescue ForkDiedException
       end
     end
     Process.wait(@child_pid)
-    result_thread.raise(ForkDiedException) if @result.nil?
+    result_thread.raise(ForkDiedException) if result_thread.status == "sleep"
     @child_pid = nil
     @result
   end

spec/spork/forker_spec.rb

@@ -29,7 +29,12 @@
     it "aborts a fork and returns nil for the result" do
       started_at = Time.now
       ended_at = nil
-      forker = Spork::Forker.new { sleep 5 }
+      forker = Spork::Forker.new do
+        begin
+          sleep 5
+        rescue SignalException
+        end
+      end
       Thread.new do
         forker.result.should == nil
         ended_at = Time.now