From 6fc730baf6b3d156e7be7521cd60f352f2c0ea93 Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Thu, 28 Jun 2012 19:01:55 -0400
Subject: Cleanup failure handling around rust_new_task_in_sched - closes #2668

---
 src/rt/rust_kernel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/rt/rust_kernel.cpp')

diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp
index b13b1490c0f..82fec98e86a 100644
--- a/src/rt/rust_kernel.cpp
+++ b/src/rt/rust_kernel.cpp
@@ -121,7 +121,9 @@ rust_kernel::get_scheduler_by_id(rust_sched_id id) {
 
 rust_scheduler *
 rust_kernel::get_scheduler_by_id_nolock(rust_sched_id id) {
-    assert(id != 0 && "invalid scheduler id");
+    if (id == 0) {
+        return NULL;
+    }
     sched_lock.must_have_lock();
     sched_map::iterator iter = sched_table.find(id);
     if (iter != sched_table.end()) {
-- 
cgit 1.4.1-3-g733a5