---

brson · brson · commit ee758d5c0579 · 2012-02-01T16:46:11.000-08:00
yaml --- r: 13964 b: refs/heads/try c: 4eb92d4 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: f76e6c39f6f2bfef58e77cf786be8d5e1e19592c
+refs/heads/try: 4eb92d41775e633fbc177b1dd163a799260835a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rt/rust_task.cpp b/branches/try/src/rt/rust_task.cpp
@@ -482,11 +482,11 @@ rust_task::fail_parent() {
 void
 rust_task::unsupervise()
 {
-    DLOG(sched, task,
+    if (supervisor) {
+        DLOG(sched, task,
              "task %s @0x%" PRIxPTR
              " disconnecting from supervisor %s @0x%" PRIxPTR,
              name, this, supervisor->name, supervisor);
-    if (supervisor) {
         supervisor->deref();
     }
     supervisor = NULL;

Original file line number	Diff line number	Diff line change
`@@ -482,11 +482,11 @@ rust_task::fail_parent() {`
`482`	`482`	`void`
`483`	`483`	`rust_task::unsupervise()`
`484`	`484`	`{`
`485`		`- DLOG(sched, task,`
	`485`	`+ if (supervisor) {`
	`486`	`+ DLOG(sched, task,`
`486`	`487`	`"task %s @0x%" PRIxPTR`
`487`	`488`	`" disconnecting from supervisor %s @0x%" PRIxPTR,`
`488`	`489`	`name, this, supervisor->name, supervisor);`
`489`		`- if (supervisor) {`
`490`	`490`	`supervisor->deref();`
`491`	`491`	`}`
`492`	`492`	`supervisor = NULL;`