Merge branch 'development' of https://git01.codeplex.com/forks/leonidcsit/379 into fix_379

stgates · stgates · commit 2bd1fed635a6 · 2015-05-18T16:41:09.000-07:00
diff --git a/Release/include/pplx/pplxtasks.h b/Release/include/pplx/pplxtasks.h
@@ -2000,6 +2000,8 @@ namespace details
                 // This exception could only have come from within the chore body. It should've been caught
                 // and the task should be canceled with exception. Swallow the exception here.
                 _ASSERTE(_HasUserException());
+				if (!_HasUserException())
+					_CancelWithException(std::current_exception());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2000,6 +2000,8 @@ namespace details`
`2000`	`2000`	`// This exception could only have come from within the chore body. It should've been caught`
`2001`	`2001`	`// and the task should be canceled with exception. Swallow the exception here.`
`2002`	`2002`	`_ASSERTE(_HasUserException());`
	`2003`	`+ if (!_HasUserException())`
	`2004`	`+ _CancelWithException(std::current_exception());`
`2003`	`2005`	`}`
`2004`	`2006`	`}`
`2005`	`2007`