Revert "Server::step throw is never catched. Replace it with an errorstream + assert"

kwolekr · kwolekr · commit 699d42efc64c · 2015-03-16T21:17:27.000-04:00
This reverts commit 5f8e48c.
diff --git a/src/server.cpp b/src/server.cpp
@@ -479,13 +479,10 @@ void Server::step(float dtime)
 		JMutexAutoLock lock(m_step_dtime_mutex);
 		m_step_dtime += dtime;
 	}
-	// Assert if fatal error occurred in thread
+	// Throw if fatal error occurred in thread
 	std::string async_err = m_async_fatal_error.get();
-	if(async_err != "") {
-		errorstream << "UNRECOVERABLE error occurred. Stopping server. "
-				<< "Please fix the following error:" << std::endl
-				<< async_err << std::endl;
-		assert(false);
+	if(async_err != ""){
+		throw ServerError(async_err);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -479,13 +479,10 @@ void Server::step(float dtime)`
`479`	`479`	`JMutexAutoLock lock(m_step_dtime_mutex);`
`480`	`480`	`m_step_dtime += dtime;`
`481`	`481`	`}`
`482`		`- // Assert if fatal error occurred in thread`
	`482`	`+ // Throw if fatal error occurred in thread`
`483`	`483`	`std::string async_err = m_async_fatal_error.get();`
`484`		`- if(async_err != "") {`
`485`		`- errorstream << "UNRECOVERABLE error occurred. Stopping server. "`
`486`		`- << "Please fix the following error:" << std::endl`
`487`		`- << async_err << std::endl;`
`488`		`- assert(false);`
	`484`	`+ if(async_err != ""){`
	`485`	`+ throw ServerError(async_err);`
`489`	`486`	`}`
`490`	`487`	`}`
`491`	`488`