Changeset 3802

Timestamp:

07/25/08 15:49:20 (4 months ago)

Author:

sean

Message:

Modified Thread.join() and Fiber.call() to return the unhandled exception if rethrow = false rather than just throwing it away. This closes #1170

Files:

trunk/lib/common/tango/core/Thread.d

r3801	r3802
534	534	* ThreadException if the operation fails.
535	535	* Any exception not handled by the joined thread.
536		*/
537		final void join( bool rethrow = true )
	536	*
	537	* Returns:
	538	* Any exception not handled by this thread if rethrow = false, null
	539	* otherwise.
	540	*/
	541	final Object join( bool rethrow = true )
538	542	{
539	543	version( Win32 )
…	…
558	562	volatile m_addr = m_addr.init;
559	563	}
560		if( rethrow && m_unhandled )
561		{
562		throw m_unhandled;
563		}
	564	if( m_unhandled )
	565	{
	566	if( rethrow )
	567	throw m_unhandled;
	568	return m_unhandled;
	569	}
	570	return null;
564	571	}
565	572
…	…
2613	2620	* Throws:
2614	2621	* Any exception not handled by the joined thread.
2615		*/
2616		final void call( bool rethrow = true )
	2622	*
	2623	* Returns:
	2624	* Any exception not handled by this fiber if rethrow = false, null
	2625	* otherwise.
	2626	*/
	2627	final Object call( bool rethrow = true )
2617	2628	in
2618	2629	{
…	…
2649	2660	m_unhandled = null;
2650	2661	if( rethrow )
2651		{
2652	2662	throw obj;
2653		}
2654		}
	2663	return obj;
	2664	}
	2665	return null;
2655	2666	}
2656	2667